cosmetic change. removing unnecessary elf_info struct.
authorDavid Zhu <yuzhu@cs.berkeley.edu>
Fri, 20 Aug 2010 21:13:49 +0000 (14:13 -0700)
committerKevin Klues <klueska@cs.berkeley.edu>
Thu, 3 Nov 2011 00:36:01 +0000 (17:36 -0700)
kern/include/elf.h
kern/src/elf.c
kern/src/manager.c

index 522de69..5b6eada 100644 (file)
@@ -54,6 +54,16 @@ typedef struct Secthdr {
        uint32_t sh_entsize;
 } secthdr_t;
 
+typedef struct
+{
+       long entry;
+       long highest_addr;
+       long phdr;
+       int phnum;
+       int dynamic;
+       char interp[256];
+} elf_info_t;
+
 typedef long elf_aux_t[2];
 
 // Values for Proghdr::p_type
index 8eadc98..8a7d97e 100644 (file)
@@ -8,15 +8,6 @@
 #include <pmap.h>
 #include <smp.h>
 
-typedef struct
-{
-       long entry;
-       long highest_addr;
-       long phdr;
-       int phnum;
-       int dynamic;
-       char interp[256];
-} elf_info_t;
 
 static int load_one_elf(struct proc *p, struct file *f, int pgoffset,
                         elf_info_t *ei)
index af4476d..ae1f0bc 100644 (file)
@@ -223,15 +223,6 @@ void manager_klueska()
        panic("DON'T PANIC");
 }
 
-struct elf_info
-{
-       long entry;
-       long phdr;
-       int phnum;
-       int dynamic;
-       char interp[256];
-};
-
 void manager_waterman()
 {
        static int init = 0;