kbuild: simplified warning report in modpost
[safe/jmp/linux-2.6] / scripts / mod / modpost.c
index 281abb7..0a80aca 100644 (file)
@@ -2,7 +2,7 @@
  *
  * Copyright 2003       Kai Germaschewski
  * Copyright 2002-2004  Rusty Russell, IBM Corporation
- * Copyright 2006       Sam Ravnborg
+ * Copyright 2006-2008  Sam Ravnborg
  * Based in part on module-init-tools/depmod.c,file2alias
  *
  * This software may be used and distributed according to the terms
@@ -23,6 +23,8 @@ int have_vmlinux = 0;
 static int all_versions = 0;
 /* If we are modposting external module set to 1 */
 static int external_module = 0;
+/* Warn about section mismatch in vmlinux if set to 1 */
+static int vmlinux_section_warnings = 1;
 /* Only warn about unresolved symbols */
 static int warn_unresolved = 0;
 /* How a symbol is exported */
@@ -31,7 +33,9 @@ enum export {
        export_unused_gpl, export_gpl_future, export_unknown
 };
 
-void fatal(const char *fmt, ...)
+#define PRINTF __attribute__ ((format (printf, 1, 2)))
+
+PRINTF void fatal(const char *fmt, ...)
 {
        va_list arglist;
 
@@ -44,7 +48,7 @@ void fatal(const char *fmt, ...)
        exit(1);
 }
 
-void warn(const char *fmt, ...)
+PRINTF void warn(const char *fmt, ...)
 {
        va_list arglist;
 
@@ -55,28 +59,40 @@ void warn(const char *fmt, ...)
        va_end(arglist);
 }
 
+PRINTF void merror(const char *fmt, ...)
+{
+       va_list arglist;
+
+       fprintf(stderr, "ERROR: ");
+
+       va_start(arglist, fmt);
+       vfprintf(stderr, fmt, arglist);
+       va_end(arglist);
+}
+
 static int is_vmlinux(const char *modname)
 {
        const char *myname;
 
-       if ((myname = strrchr(modname, '/')))
+       myname = strrchr(modname, '/');
+       if (myname)
                myname++;
        else
                myname = modname;
 
-       return strcmp(myname, "vmlinux") == 0;
+       return (strcmp(myname, "vmlinux") == 0) ||
+              (strcmp(myname, "vmlinux.o") == 0);
 }
 
 void *do_nofail(void *ptr, const char *expr)
 {
-       if (!ptr) {
+       if (!ptr)
                fatal("modpost: Memory allocation failure: %s.\n", expr);
-       }
+
        return ptr;
 }
 
 /* A list of all modules we processed */
-
 static struct module *modules;
 
 static struct module *find_module(char *modname)
@@ -99,7 +115,8 @@ static struct module *new_module(char *modname)
        p = NOFAIL(strdup(modname));
 
        /* strip trailing .o */
-       if ((s = strrchr(p, '.')) != NULL)
+       s = strrchr(p, '.');
+       if (s != NULL)
                if (strcmp(s, ".o") == 0)
                        *s = '\0';
 
@@ -140,7 +157,7 @@ static inline unsigned int tdb_hash(const char *name)
        unsigned   i;   /* Used to cycle through random values. */
 
        /* Set the initial value from the key size. */
-       for (value = 0x238F13AF * strlen(name), i=0; name[i]; i++)
+       for (value = 0x238F13AF * strlen(name), i = 0; name[i]; i++)
                value = (value + (((unsigned char *)name)[i] << (i*5 % 24)));
 
        return (1103515243 * value + 12345);
@@ -184,7 +201,7 @@ static struct symbol *find_symbol(const char *name)
        if (name[0] == '.')
                name++;
 
-       for (s = symbolhash[tdb_hash(name) % SYMBOL_HASH_SIZE]; s; s=s->next) {
+       for (s = symbolhash[tdb_hash(name) % SYMBOL_HASH_SIZE]; s; s = s->next) {
                if (strcmp(s->name, name) == 0)
                        return s;
        }
@@ -209,9 +226,10 @@ static const char *export_str(enum export ex)
        return export_list[ex].str;
 }
 
-static enum export export_no(const char * s)
+static enum export export_no(const char *s)
 {
        int i;
+
        if (!s)
                return export_unknown;
        for (i = 0; export_list[i].export != export_unknown; i++) {
@@ -254,6 +272,9 @@ static struct symbol *sym_add_exported(const char *name, struct module *mod,
                             "was in %s%s\n", mod->name, name,
                             s->module->name,
                             is_vmlinux(s->module->name) ?"":".ko");
+               } else {
+                       /* In case Modules.symvers was out of date */
+                       s->module = mod;
                }
        }
        s->preloaded = 0;
@@ -298,7 +319,7 @@ void *grab_file(const char *filename, unsigned long *size)
   * spaces in the beginning of the line is trimmed away.
   * Return a pointer to a static buffer.
   **/
-charget_next_line(unsigned long *pos, void *file, unsigned long size)
+char *get_next_line(unsigned long *pos, void *file, unsigned long size)
 {
        static char line[4096];
        int skip = 1;
@@ -306,8 +327,7 @@ char* get_next_line(unsigned long *pos, void *file, unsigned long size)
        signed char *p = (signed char *)file + *pos;
        char *s = line;
 
-       for (; *pos < size ; (*pos)++)
-       {
+       for (; *pos < size ; (*pos)++) {
                if (skip && isspace(*p)) {
                        p++;
                        continue;
@@ -363,9 +383,18 @@ static int parse_elf(struct elf_info *info, const char *filename)
        hdr->e_shstrndx = TO_NATIVE(hdr->e_shstrndx);
        hdr->e_shnum    = TO_NATIVE(hdr->e_shnum);
        hdr->e_machine  = TO_NATIVE(hdr->e_machine);
+       hdr->e_type     = TO_NATIVE(hdr->e_type);
        sechdrs = (void *)hdr + hdr->e_shoff;
        info->sechdrs = sechdrs;
 
+       /* Check if file offset is correct */
+       if (hdr->e_shoff > info->size) {
+               fatal("section header offset=%lu in file '%s' is bigger than "
+                     "filesize=%lu\n", (unsigned long)hdr->e_shoff,
+                     filename, info->size);
+               return 0;
+       }
+
        /* Fix endianness in section headers */
        for (i = 0; i < hdr->e_shnum; i++) {
                sechdrs[i].sh_type   = TO_NATIVE(sechdrs[i].sh_type);
@@ -373,6 +402,8 @@ static int parse_elf(struct elf_info *info, const char *filename)
                sechdrs[i].sh_size   = TO_NATIVE(sechdrs[i].sh_size);
                sechdrs[i].sh_link   = TO_NATIVE(sechdrs[i].sh_link);
                sechdrs[i].sh_name   = TO_NATIVE(sechdrs[i].sh_name);
+               sechdrs[i].sh_info   = TO_NATIVE(sechdrs[i].sh_info);
+               sechdrs[i].sh_addr   = TO_NATIVE(sechdrs[i].sh_addr);
        }
        /* Find symbol table. */
        for (i = 1; i < hdr->e_shnum; i++) {
@@ -381,7 +412,10 @@ static int parse_elf(struct elf_info *info, const char *filename)
                const char *secname;
 
                if (sechdrs[i].sh_offset > info->size) {
-                       fatal("%s is truncated. sechdrs[i].sh_offset=%u > sizeof(*hrd)=%ul\n", filename, (unsigned int)sechdrs[i].sh_offset, sizeof(*hdr));
+                       fatal("%s is truncated. sechdrs[i].sh_offset=%lu > "
+                             "sizeof(*hrd)=%zu\n", filename,
+                             (unsigned long)sechdrs[i].sh_offset,
+                             sizeof(*hdr));
                        return 0;
                }
                secname = secstrings + sechdrs[i].sh_name;
@@ -408,9 +442,9 @@ static int parse_elf(struct elf_info *info, const char *filename)
                info->strtab       = (void *)hdr +
                                     sechdrs[sechdrs[i].sh_link].sh_offset;
        }
-       if (!info->symtab_start) {
+       if (!info->symtab_start)
                fatal("%s has no symtab?\n", filename);
-       }
+
        /* Fix endianness in symbols */
        for (sym = info->symtab_start; sym < info->symtab_stop; sym++) {
                sym->st_shndx = TO_NATIVE(sym->st_shndx);
@@ -479,11 +513,13 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
 #endif
 
                if (memcmp(symname, MODULE_SYMBOL_PREFIX,
-                          strlen(MODULE_SYMBOL_PREFIX)) == 0)
-                       mod->unres = alloc_symbol(symname +
-                                                 strlen(MODULE_SYMBOL_PREFIX),
-                                                 ELF_ST_BIND(sym->st_info) == STB_WEAK,
-                                                 mod->unres);
+                          strlen(MODULE_SYMBOL_PREFIX)) == 0) {
+                       mod->unres =
+                         alloc_symbol(symname +
+                                      strlen(MODULE_SYMBOL_PREFIX),
+                                      ELF_ST_BIND(sym->st_info) == STB_WEAK,
+                                      mod->unres);
+               }
                break;
        default:
                /* All exported symbols */
@@ -552,25 +588,241 @@ static char *get_modinfo(void *modinfo, unsigned long modinfo_len,
  **/
 static int strrcmp(const char *s, const char *sub)
 {
-        int slen, sublen;
+       int slen, sublen;
 
        if (!s || !sub)
                return 1;
 
        slen = strlen(s);
-        sublen = strlen(sub);
+       sublen = strlen(sub);
 
        if ((slen == 0) || (sublen == 0))
                return 1;
 
-        if (sublen > slen)
-                return 1;
+       if (sublen > slen)
+               return 1;
+
+       return memcmp(s + slen - sublen, sub, sublen);
+}
+
+static const char *sym_name(struct elf_info *elf, Elf_Sym *sym)
+{
+       if (sym)
+               return elf->strtab + sym->st_name;
+       else
+               return "";
+}
+
+static const char *sec_name(struct elf_info *elf, int shndx)
+{
+       Elf_Shdr *sechdrs = elf->sechdrs;
+       return (void *)elf->hdr +
+               elf->sechdrs[elf->hdr->e_shstrndx].sh_offset +
+               sechdrs[shndx].sh_name;
+}
+
+static const char *sech_name(struct elf_info *elf, Elf_Shdr *sechdr)
+{
+       return (void *)elf->hdr +
+               elf->sechdrs[elf->hdr->e_shstrndx].sh_offset +
+               sechdr->sh_name;
+}
+
+/* if sym is empty or point to a string
+ * like ".[0-9]+" then return 1.
+ * This is the optional prefix added by ld to some sections
+ */
+static int number_prefix(const char *sym)
+{
+       if (*sym++ == '\0')
+               return 1;
+       if (*sym != '.')
+               return 0;
+       do {
+               char c = *sym++;
+               if (c < '0' || c > '9')
+                       return 0;
+       } while (*sym);
+       return 1;
+}
 
-        return memcmp(s + slen - sublen, sub, sublen);
+/* The pattern is an array of simple patterns.
+ * "foo" will match an exact string equal to "foo"
+ * "*foo" will match a string that ends with "foo"
+ * "foo*" will match a string that begins with "foo"
+ * "foo$" will match a string equal to "foo" or "foo.1"
+ *   where the '1' can be any number including several digits.
+ *   The $ syntax is for sections where ld append a dot number
+ *   to make section name unique.
+ */
+int match(const char *sym, const char * const pat[])
+{
+       const char *p;
+       while (*pat) {
+               p = *pat++;
+               const char *endp = p + strlen(p) - 1;
+
+               /* "*foo" */
+               if (*p == '*') {
+                       if (strrcmp(sym, p + 1) == 0)
+                               return 1;
+               }
+               /* "foo*" */
+               else if (*endp == '*') {
+                       if (strncmp(sym, p, strlen(p) - 1) == 0)
+                               return 1;
+               }
+               /* "foo$" */
+               else if (*endp == '$') {
+                       if (strncmp(sym, p, strlen(p) - 1) == 0) {
+                               if (number_prefix(sym + strlen(p) - 1))
+                                       return 1;
+                       }
+               }
+               /* no wildcards */
+               else {
+                       if (strcmp(p, sym) == 0)
+                               return 1;
+               }
+       }
+       /* no match */
+       return 0;
+}
+
+/* sections that we do not want to do full section mismatch check on */
+static const char *section_white_list[] =
+       { ".debug*", ".stab*", ".note*", ".got*", ".toc*", NULL };
+
+#define ALL_INIT_DATA_SECTIONS \
+       ".init.data$", ".devinit.data$", ".cpuinit.data$", ".meminit.data$"
+#define ALL_EXIT_DATA_SECTIONS \
+       ".exit.data$", ".devexit.data$", ".cpuexit.data$", ".memexit.data$"
+
+#define ALL_INIT_TEXT_SECTIONS \
+       ".init.text$", ".devinit.text$", ".cpuinit.text$", ".meminit.text$"
+#define ALL_EXIT_TEXT_SECTIONS \
+       ".exit.text$", ".devexit.text$", ".cpuexit.text$", ".memexit.text$"
+
+#define ALL_INIT_SECTIONS ALL_INIT_DATA_SECTIONS, ALL_INIT_TEXT_SECTIONS
+#define ALL_EXIT_SECTIONS ALL_EXIT_DATA_SECTIONS, ALL_EXIT_TEXT_SECTIONS
+
+#define DATA_SECTIONS ".data$", ".data.rel$"
+#define TEXT_SECTIONS ".text$"
+
+#define INIT_SECTIONS      ".init.data$", ".init.text$"
+#define DEV_INIT_SECTIONS  ".devinit.data$", ".devinit.text$"
+#define CPU_INIT_SECTIONS  ".cpuinit.data$", ".cpuinit.text$"
+#define MEM_INIT_SECTIONS  ".meminit.data$", ".meminit.text$"
+
+#define EXIT_SECTIONS      ".exit.data$", ".exit.text$"
+#define DEV_EXIT_SECTIONS  ".devexit.data$", ".devexit.text$"
+#define CPU_EXIT_SECTIONS  ".cpuexit.data$", ".cpuexit.text$"
+#define MEM_EXIT_SECTIONS  ".memexit.data$", ".memexit.text$"
+
+/* init data sections */
+static const char *init_data_sections[] = { ALL_INIT_DATA_SECTIONS, NULL };
+
+/* all init sections */
+static const char *init_sections[] = { ALL_INIT_SECTIONS, NULL };
+
+/* All init and exit sections (code + data) */
+static const char *init_exit_sections[] =
+       {ALL_INIT_SECTIONS, ALL_EXIT_SECTIONS, NULL };
+
+/* data section */
+static const char *data_sections[] = { DATA_SECTIONS, NULL };
+
+/* sections that may refer to an init/exit section with no warning */
+static const char *initref_sections[] =
+{
+       ".text.init.refok*",
+       ".exit.text.refok*",
+       ".data.init.refok*",
+       NULL
+};
+
+
+/* symbols in .data that may refer to init/exit sections */
+static const char *symbol_white_list[] =
+{
+       "*driver",
+       "*_template", /* scsi uses *_template a lot */
+       "*_timer",    /* arm uses ops structures named _timer a lot */
+       "*_sht",      /* scsi also used *_sht to some extent */
+       "*_ops",
+       "*_probe",
+       "*_probe_one",
+       "*_console",
+       NULL
+};
+
+static const char *head_sections[] = { ".head.text*", NULL };
+static const char *linker_symbols[] =
+       { "__init_begin", "_sinittext", "_einittext", NULL };
+
+struct sectioncheck {
+       const char *fromsec[20];
+       const char *tosec[20];
+};
+
+const struct sectioncheck sectioncheck[] = {
+/* Do not reference init/exit code/data from
+ * normal code and data
+ */
+{
+       .fromsec = { TEXT_SECTIONS, DATA_SECTIONS, NULL },
+       .tosec   = { ALL_INIT_SECTIONS, ALL_EXIT_SECTIONS, NULL }
+},
+/* Do not reference init code/data from devinit/cpuinit/meminit code/data */
+{
+       .fromsec = { DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, MEM_INIT_SECTIONS, NULL },
+       .tosec   = { INIT_SECTIONS, NULL }
+},
+/* Do not reference exit code/data from devexit/cpuexit/memexit code/data */
+{
+       .fromsec = { DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS, NULL },
+       .tosec   = { EXIT_SECTIONS, NULL }
+},
+/* Do not use exit code/data from init code */
+{
+       .fromsec = { ALL_INIT_SECTIONS, NULL },
+       .tosec   = { ALL_EXIT_SECTIONS, NULL },
+},
+/* Do not use init code/data from exit code */
+{
+       .fromsec = { ALL_EXIT_SECTIONS, NULL },
+       .tosec   = { ALL_INIT_SECTIONS, NULL }
+},
+/* Do not export init/exit functions or data */
+{
+       .fromsec = { "__ksymtab*", NULL },
+       .tosec   = { ALL_INIT_SECTIONS, ALL_EXIT_SECTIONS, NULL }
+}
+};
+
+static int section_mismatch(const char *fromsec, const char *tosec)
+{
+       int i;
+       int elems = sizeof(sectioncheck) / sizeof(struct sectioncheck);
+       const struct sectioncheck *check = &sectioncheck[0];
+
+       for (i = 0; i < elems; i++) {
+               if (match(fromsec, check->fromsec) &&
+                   match(tosec, check->tosec))
+                       return 1;
+               check++;
+       }
+       return 0;
 }
 
 /**
  * Whitelist to allow certain references to pass with no warning.
+ *
+ * Pattern 0:
+ *   Do not warn if funtion/data are marked with __init_refok/__initdata_refok.
+ *   The pattern is identified by:
+ *   fromsec = .text.init.refok* | .data.init.refok*
+ *
  * Pattern 1:
  *   If a module parameter is declared __initdata and permissions=0
  *   then this is legal despite the warning generated.
@@ -587,19 +839,16 @@ static int strrcmp(const char *s, const char *sub)
  *   These functions may often be marked __init and we do not want to
  *   warn here.
  *   the pattern is identified by:
- *   tosec   = .init.text | .exit.text | .init.data
- *   fromsec = .data
- *   atsym = *driver, *_template, *_sht, *_ops, *_probe, *probe_one, *_console
+ *   tosec   = init or exit section
+ *   fromsec = data section
+ *   atsym = *driver, *_template, *_sht, *_ops, *_probe,
+ *           *probe_one, *_console, *_timer
  *
  * Pattern 3:
- *   Whitelist all references from .pci_fixup* section to .init.text
- *   This is part of the PCI init when built-in
- *
- * Pattern 4:
  *   Whitelist all refereces from .text.head to .init.data
  *   Whitelist all refereces from .text.head to .init.text
  *
- * Pattern 5:
+ * Pattern 4:
  *   Some symbols belong to init section but still it is ok to reference
  *   these from non-init sections as these symbols don't have any memory
  *   allocated for them and symbol address and value are same. So even
@@ -608,86 +857,36 @@ static int strrcmp(const char *s, const char *sub)
  *   This pattern is identified by
  *   refsymname = __init_begin, _sinittext, _einittext
  *
- * Pattern 6:
- *   During the early init phase we have references from .init.text to
- *   .text we have an intended section mismatch - do not warn about it.
- *   See kernel_init() in init/main.c
- *   tosec   = .init.text
- *   fromsec = .text
- *   atsym = kernel_init
- *   Some symbols belong to init section but still it is ok to reference
  **/
-static int secref_whitelist(const char *modname, const char *tosec,
-                           const char *fromsec, const char *atsym,
-                           const char *refsymname)
-{
-       int f1 = 1, f2 = 1;
-       const char **s;
-       const char *pat2sym[] = {
-               "driver",
-               "_template", /* scsi uses *_template a lot */
-               "_sht",      /* scsi also used *_sht to some extent */
-               "_ops",
-               "_probe",
-               "_probe_one",
-               "_console",
-               NULL
-       };
-
-       const char *pat3refsym[] = {
-               "__init_begin",
-               "_sinittext",
-               "_einittext",
-               NULL
-       };
+static int secref_whitelist(const char *fromsec, const char *fromsym,
+                           const char *tosec, const char *tosym)
+{
+       /* Check for pattern 0 */
+       if (match(fromsec, initref_sections))
+               return 0;
 
        /* Check for pattern 1 */
-       if (strcmp(tosec, ".init.data") != 0)
-               f1 = 0;
-       if (strncmp(fromsec, ".data", strlen(".data")) != 0)
-               f1 = 0;
-       if (strncmp(atsym, "__param", strlen("__param")) != 0)
-               f1 = 0;
-
-       if (f1)
-               return f1;
+       if (match(tosec, init_data_sections) &&
+           match(fromsec, data_sections) &&
+           (strncmp(fromsym, "__param", strlen("__param")) == 0))
+               return 0;
 
        /* Check for pattern 2 */
-       if ((strcmp(tosec, ".init.text") != 0) &&
-           (strcmp(tosec, ".exit.text") != 0) &&
-           (strcmp(tosec, ".init.data") != 0))
-               f2 = 0;
-       if (strcmp(fromsec, ".data") != 0)
-               f2 = 0;
-
-       for (s = pat2sym; *s; s++)
-               if (strrcmp(atsym, *s) == 0)
-                       f1 = 1;
-       if (f1 && f2)
-               return 1;
+       if (match(tosec, init_exit_sections) &&
+           match(fromsec, data_sections) &&
+           match(fromsym, symbol_white_list))
+               return 0;
 
        /* Check for pattern 3 */
-       if ((strncmp(fromsec, ".pci_fixup", strlen(".pci_fixup")) == 0) &&
-           (strcmp(tosec, ".init.text") == 0))
-       return 1;
+       if (match(fromsec, head_sections) &&
+           match(tosec, init_sections))
+               return 0;
 
        /* Check for pattern 4 */
-       if ((strcmp(fromsec, ".text.head") == 0) &&
-               ((strcmp(tosec, ".init.data") == 0) ||
-               (strcmp(tosec, ".init.text") == 0)))
-       return 1;
-
-       /* Check for pattern 5 */
-       for (s = pat3refsym; *s; s++)
-               if (strcmp(refsymname, *s) == 0)
-                       return 1;
+       if (match(tosym, linker_symbols))
+               return 0;
 
-       /* Check for pattern 6 */
-       if ((strcmp(tosec, ".init.text") == 0) &&
-           (strcmp(fromsec, ".text") == 0) &&
-           (strcmp(refsymname, "kernel_init") == 0))
-               return 1;
-       return 0;
+       return 1;
 }
 
 /**
@@ -697,20 +896,37 @@ static int secref_whitelist(const char *modname, const char *tosec,
  * In other cases the symbol needs to be looked up in the symbol table
  * based on section and address.
  *  **/
-static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf_Addr addr,
+static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
                                Elf_Sym *relsym)
 {
        Elf_Sym *sym;
+       Elf_Sym *near = NULL;
+       Elf64_Sword distance = 20;
+       Elf64_Sword d;
 
        if (relsym->st_name != 0)
                return relsym;
        for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) {
                if (sym->st_shndx != relsym->st_shndx)
                        continue;
+               if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
+                       continue;
                if (sym->st_value == addr)
                        return sym;
+               /* Find a symbol nearby - addr are maybe negative */
+               d = sym->st_value - addr;
+               if (d < 0)
+                       d = addr - sym->st_value;
+               if (d < distance) {
+                       distance = d;
+                       near = sym;
+               }
        }
-       return NULL;
+       /* We need a close match */
+       if (distance < 20)
+               return near;
+       else
+               return NULL;
 }
 
 static inline int is_arm_mapping_symbol(const char *str)
@@ -743,105 +959,253 @@ static inline int is_valid_name(struct elf_info *elf, Elf_Sym *sym)
  * The ELF format may have a better way to detect what type of symbol
  * it is, but this works for now.
  **/
-static void find_symbols_between(struct elf_info *elf, Elf_Addr addr,
-                                const char *sec,
-                                Elf_Sym **before, Elf_Sym **after)
+static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr,
+                                const char *sec)
 {
        Elf_Sym *sym;
-       Elf_Ehdr *hdr = elf->hdr;
-       Elf_Addr beforediff = ~0;
-       Elf_Addr afterdiff = ~0;
-       const char *secstrings = (void *)hdr +
-                                elf->sechdrs[hdr->e_shstrndx].sh_offset;
-
-       *before = NULL;
-       *after = NULL;
+       Elf_Sym *near = NULL;
+       Elf_Addr distance = ~0;
 
        for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) {
                const char *symsec;
 
                if (sym->st_shndx >= SHN_LORESERVE)
                        continue;
-               symsec = secstrings + elf->sechdrs[sym->st_shndx].sh_name;
+               symsec = sec_name(elf, sym->st_shndx);
                if (strcmp(symsec, sec) != 0)
                        continue;
                if (!is_valid_name(elf, sym))
                        continue;
                if (sym->st_value <= addr) {
-                       if ((addr - sym->st_value) < beforediff) {
-                               beforediff = addr - sym->st_value;
-                               *before = sym;
-                       }
-                       else if ((addr - sym->st_value) == beforediff) {
-                               *before = sym;
-                       }
-               }
-               else
-               {
-                       if ((sym->st_value - addr) < afterdiff) {
-                               afterdiff = sym->st_value - addr;
-                               *after = sym;
-                       }
-                       else if ((sym->st_value - addr) == afterdiff) {
-                               *after = sym;
+                       if ((addr - sym->st_value) < distance) {
+                               distance = addr - sym->st_value;
+                               near = sym;
+                       } else if ((addr - sym->st_value) == distance) {
+                               near = sym;
                        }
                }
        }
+       return near;
 }
 
-/**
+/*
  * Print a warning about a section mismatch.
  * Try to find symbols near it so user can find it.
  * Check whitelist before warning - it may be a false positive.
- **/
-static void warn_sec_mismatch(const char *modname, const char *fromsec,
-                             struct elf_info *elf, Elf_Sym *sym, Elf_Rela r)
+ */
+static void report_sec_mismatch(const char *modname,
+                                const char *fromsec,
+                                unsigned long long fromaddr,
+                                const char *fromsym,
+                                const char *tosec, const char *tosym)
+{
+       if (strlen(tosym)) {
+               warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s "
+                    "in '%s'\n",
+                    modname, fromsec, fromaddr,
+                    tosec, tosym, fromsym);
+       } else {
+               warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s\n",
+                    modname, fromsec, fromaddr,
+                    tosec, tosym);
+       }
+}
+
+static void check_section_mismatch(const char *modname, struct elf_info *elf,
+                                   Elf_Rela *r, Elf_Sym *sym, const char *fromsec)
+{
+       const char *tosec;
+
+       tosec = sec_name(elf, sym->st_shndx);
+       if (section_mismatch(fromsec, tosec)) {
+               const char *fromsym;
+               const char *tosym;
+
+               fromsym = sym_name(elf,
+                         find_elf_symbol2(elf, r->r_offset, fromsec));
+               tosym = sym_name(elf,
+                       find_elf_symbol(elf, r->r_addend, sym));
+
+               /* check whitelist - we may ignore it */
+               if (secref_whitelist(fromsec, fromsym, tosec, tosym)) {
+                       report_sec_mismatch(modname, fromsec, r->r_offset,
+                                           fromsym, tosec, tosym);
+               }
+       }
+}
+
+static unsigned int *reloc_location(struct elf_info *elf,
+                                   Elf_Shdr *sechdr, Elf_Rela *r)
 {
-       const char *refsymname = "";
-       Elf_Sym *before, *after;
-       Elf_Sym *refsym;
-       Elf_Ehdr *hdr = elf->hdr;
        Elf_Shdr *sechdrs = elf->sechdrs;
-       const char *secstrings = (void *)hdr +
-                                sechdrs[hdr->e_shstrndx].sh_offset;
-       const char *secname = secstrings + sechdrs[sym->st_shndx].sh_name;
+       int section = sechdr->sh_info;
 
-       find_symbols_between(elf, r.r_offset, fromsec, &before, &after);
+       return (void *)elf->hdr + sechdrs[section].sh_offset +
+               (r->r_offset - sechdrs[section].sh_addr);
+}
+
+static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
+{
+       unsigned int r_typ = ELF_R_TYPE(r->r_info);
+       unsigned int *location = reloc_location(elf, sechdr, r);
+
+       switch (r_typ) {
+       case R_386_32:
+               r->r_addend = TO_NATIVE(*location);
+               break;
+       case R_386_PC32:
+               r->r_addend = TO_NATIVE(*location) + 4;
+               /* For CONFIG_RELOCATABLE=y */
+               if (elf->hdr->e_type == ET_EXEC)
+                       r->r_addend += r->r_offset;
+               break;
+       }
+       return 0;
+}
 
-       refsym = find_elf_symbol(elf, r.r_addend, sym);
-       if (refsym && strlen(elf->strtab + refsym->st_name))
-               refsymname = elf->strtab + refsym->st_name;
+static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
+{
+       unsigned int r_typ = ELF_R_TYPE(r->r_info);
+
+       switch (r_typ) {
+       case R_ARM_ABS32:
+               /* From ARM ABI: (S + A) | T */
+               r->r_addend = (int)(long)
+                             (elf->symtab_start + ELF_R_SYM(r->r_info));
+               break;
+       case R_ARM_PC24:
+               /* From ARM ABI: ((S + A) | T) - P */
+               r->r_addend = (int)(long)(elf->hdr +
+                             sechdr->sh_offset +
+                             (r->r_offset - sechdr->sh_addr));
+               break;
+       default:
+               return 1;
+       }
+       return 0;
+}
 
-       /* check whitelist - we may ignore it */
-       if (before &&
-           secref_whitelist(modname, secname, fromsec,
-                            elf->strtab + before->st_name, refsymname))
+static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
+{
+       unsigned int r_typ = ELF_R_TYPE(r->r_info);
+       unsigned int *location = reloc_location(elf, sechdr, r);
+       unsigned int inst;
+
+       if (r_typ == R_MIPS_HI16)
+               return 1;       /* skip this */
+       inst = TO_NATIVE(*location);
+       switch (r_typ) {
+       case R_MIPS_LO16:
+               r->r_addend = inst & 0xffff;
+               break;
+       case R_MIPS_26:
+               r->r_addend = (inst & 0x03ffffff) << 2;
+               break;
+       case R_MIPS_32:
+               r->r_addend = inst;
+               break;
+       }
+       return 0;
+}
+
+static void section_rela(const char *modname, struct elf_info *elf,
+                         Elf_Shdr *sechdr)
+{
+       Elf_Sym  *sym;
+       Elf_Rela *rela;
+       Elf_Rela r;
+       unsigned int r_sym;
+       const char *fromsec;
+
+       Elf_Rela *start = (void *)elf->hdr + sechdr->sh_offset;
+       Elf_Rela *stop  = (void *)start + sechdr->sh_size;
+
+       fromsec = sech_name(elf, sechdr);
+       fromsec += strlen(".rela");
+       /* if from section (name) is know good then skip it */
+       if (match(fromsec, section_white_list))
                return;
+       for (rela = start; rela < stop; rela++) {
+               r.r_offset = TO_NATIVE(rela->r_offset);
+#if KERNEL_ELFCLASS == ELFCLASS64
+               if (elf->hdr->e_machine == EM_MIPS) {
+                       unsigned int r_typ;
+                       r_sym = ELF64_MIPS_R_SYM(rela->r_info);
+                       r_sym = TO_NATIVE(r_sym);
+                       r_typ = ELF64_MIPS_R_TYPE(rela->r_info);
+                       r.r_info = ELF64_R_INFO(r_sym, r_typ);
+               } else {
+                       r.r_info = TO_NATIVE(rela->r_info);
+                       r_sym = ELF_R_SYM(r.r_info);
+               }
+#else
+               r.r_info = TO_NATIVE(rela->r_info);
+               r_sym = ELF_R_SYM(r.r_info);
+#endif
+               r.r_addend = TO_NATIVE(rela->r_addend);
+               sym = elf->symtab_start + r_sym;
+               /* Skip special sections */
+               if (sym->st_shndx >= SHN_LORESERVE)
+                       continue;
+               check_section_mismatch(modname, elf, &r, sym, fromsec);
+       }
+}
 
-       if (before && after) {
-               warn("%s - Section mismatch: reference to %s:%s from %s "
-                    "between '%s' (at offset 0x%llx) and '%s'\n",
-                    modname, secname, refsymname, fromsec,
-                    elf->strtab + before->st_name,
-                    (long long)r.r_offset,
-                    elf->strtab + after->st_name);
-       } else if (before) {
-               warn("%s - Section mismatch: reference to %s:%s from %s "
-                    "after '%s' (at offset 0x%llx)\n",
-                    modname, secname, refsymname, fromsec,
-                    elf->strtab + before->st_name,
-                    (long long)r.r_offset);
-       } else if (after) {
-               warn("%s - Section mismatch: reference to %s:%s from %s "
-                    "before '%s' (at offset -0x%llx)\n",
-                    modname, secname, refsymname, fromsec,
-                    elf->strtab + after->st_name,
-                    (long long)r.r_offset);
-       } else {
-               warn("%s - Section mismatch: reference to %s:%s from %s "
-                    "(offset 0x%llx)\n",
-                    modname, secname, fromsec, refsymname,
-                    (long long)r.r_offset);
+static void section_rel(const char *modname, struct elf_info *elf,
+                        Elf_Shdr *sechdr)
+{
+       Elf_Sym *sym;
+       Elf_Rel *rel;
+       Elf_Rela r;
+       unsigned int r_sym;
+       const char *fromsec;
+
+       Elf_Rel *start = (void *)elf->hdr + sechdr->sh_offset;
+       Elf_Rel *stop  = (void *)start + sechdr->sh_size;
+
+       fromsec = sech_name(elf, sechdr);
+       fromsec += strlen(".rel");
+       /* if from section (name) is know good then skip it */
+       if (match(fromsec, section_white_list))
+               return;
+
+       for (rel = start; rel < stop; rel++) {
+               r.r_offset = TO_NATIVE(rel->r_offset);
+#if KERNEL_ELFCLASS == ELFCLASS64
+               if (elf->hdr->e_machine == EM_MIPS) {
+                       unsigned int r_typ;
+                       r_sym = ELF64_MIPS_R_SYM(rel->r_info);
+                       r_sym = TO_NATIVE(r_sym);
+                       r_typ = ELF64_MIPS_R_TYPE(rel->r_info);
+                       r.r_info = ELF64_R_INFO(r_sym, r_typ);
+               } else {
+                       r.r_info = TO_NATIVE(rel->r_info);
+                       r_sym = ELF_R_SYM(r.r_info);
+               }
+#else
+               r.r_info = TO_NATIVE(rel->r_info);
+               r_sym = ELF_R_SYM(r.r_info);
+#endif
+               r.r_addend = 0;
+               switch (elf->hdr->e_machine) {
+               case EM_386:
+                       if (addend_386_rel(elf, sechdr, &r))
+                               continue;
+                       break;
+               case EM_ARM:
+                       if (addend_arm_rel(elf, sechdr, &r))
+                               continue;
+                       break;
+               case EM_MIPS:
+                       if (addend_mips_rel(elf, sechdr, &r))
+                               continue;
+                       break;
+               }
+               sym = elf->symtab_start + r_sym;
+               /* Skip special sections */
+               if (sym->st_shndx >= SHN_LORESERVE)
+                       continue;
+               check_section_mismatch(modname, elf, &r, sym, fromsec);
        }
 }
 
@@ -858,255 +1222,21 @@ static void warn_sec_mismatch(const char *modname, const char *fromsec,
  * be discarded and warns about it.
  **/
 static void check_sec_ref(struct module *mod, const char *modname,
-                         struct elf_info *elf,
-                         int section(const char*),
-                         int section_ref_ok(const char *))
+                          struct elf_info *elf)
 {
        int i;
-       Elf_Sym  *sym;
-       Elf_Ehdr *hdr = elf->hdr;
        Elf_Shdr *sechdrs = elf->sechdrs;
-       const char *secstrings = (void *)hdr +
-                                sechdrs[hdr->e_shstrndx].sh_offset;
 
        /* Walk through all sections */
-       for (i = 0; i < hdr->e_shnum; i++) {
-               const char *name = secstrings + sechdrs[i].sh_name;
-               const char *secname;
-               Elf_Rela r;
-               unsigned int r_sym;
+       for (i = 0; i < elf->hdr->e_shnum; i++) {
                /* We want to process only relocation sections and not .init */
-               if (sechdrs[i].sh_type == SHT_RELA) {
-                       Elf_Rela *rela;
-                       Elf_Rela *start = (void *)hdr + sechdrs[i].sh_offset;
-                       Elf_Rela *stop  = (void*)start + sechdrs[i].sh_size;
-                       name += strlen(".rela");
-                       if (section_ref_ok(name))
-                               continue;
-
-                       for (rela = start; rela < stop; rela++) {
-                               r.r_offset = TO_NATIVE(rela->r_offset);
-#if KERNEL_ELFCLASS == ELFCLASS64
-                               if (hdr->e_machine == EM_MIPS) {
-                                       r_sym = ELF64_MIPS_R_SYM(rela->r_info);
-                                       r_sym = TO_NATIVE(r_sym);
-                               } else {
-                                       r.r_info = TO_NATIVE(rela->r_info);
-                                       r_sym = ELF_R_SYM(r.r_info);
-                               }
-#else
-                               r.r_info = TO_NATIVE(rela->r_info);
-                               r_sym = ELF_R_SYM(r.r_info);
-#endif
-                               r.r_addend = TO_NATIVE(rela->r_addend);
-                               sym = elf->symtab_start + r_sym;
-                               /* Skip special sections */
-                               if (sym->st_shndx >= SHN_LORESERVE)
-                                       continue;
-
-                               secname = secstrings +
-                                       sechdrs[sym->st_shndx].sh_name;
-                               if (section(secname))
-                                       warn_sec_mismatch(modname, name,
-                                                         elf, sym, r);
-                       }
-               } else if (sechdrs[i].sh_type == SHT_REL) {
-                       Elf_Rel *rel;
-                       Elf_Rel *start = (void *)hdr + sechdrs[i].sh_offset;
-                       Elf_Rel *stop  = (void*)start + sechdrs[i].sh_size;
-                       name += strlen(".rel");
-                       if (section_ref_ok(name))
-                               continue;
-
-                       for (rel = start; rel < stop; rel++) {
-                               r.r_offset = TO_NATIVE(rel->r_offset);
-#if KERNEL_ELFCLASS == ELFCLASS64
-                               if (hdr->e_machine == EM_MIPS) {
-                                       r_sym = ELF64_MIPS_R_SYM(rel->r_info);
-                                       r_sym = TO_NATIVE(r_sym);
-                               } else {
-                                       r.r_info = TO_NATIVE(rel->r_info);
-                                       r_sym = ELF_R_SYM(r.r_info);
-                               }
-#else
-                               r.r_info = TO_NATIVE(rel->r_info);
-                               r_sym = ELF_R_SYM(r.r_info);
-#endif
-                               r.r_addend = 0;
-                               sym = elf->symtab_start + r_sym;
-                               /* Skip special sections */
-                               if (sym->st_shndx >= SHN_LORESERVE)
-                                       continue;
-
-                               secname = secstrings +
-                                       sechdrs[sym->st_shndx].sh_name;
-                               if (section(secname))
-                                       warn_sec_mismatch(modname, name,
-                                                         elf, sym, r);
-                       }
-               }
+               if (sechdrs[i].sh_type == SHT_RELA)
+                       section_rela(modname, elf, &elf->sechdrs[i]);
+               else if (sechdrs[i].sh_type == SHT_REL)
+                       section_rel(modname, elf, &elf->sechdrs[i]);
        }
 }
 
-/**
- * Functions used only during module init is marked __init and is stored in
- * a .init.text section. Likewise data is marked __initdata and stored in
- * a .init.data section.
- * If this section is one of these sections return 1
- * See include/linux/init.h for the details
- **/
-static int init_section(const char *name)
-{
-       if (strcmp(name, ".init") == 0)
-               return 1;
-       if (strncmp(name, ".init.", strlen(".init.")) == 0)
-               return 1;
-       return 0;
-}
-
-/**
- * Identify sections from which references to a .init section is OK.
- *
- * Unfortunately references to read only data that referenced .init
- * sections had to be excluded. Almost all of these are false
- * positives, they are created by gcc. The downside of excluding rodata
- * is that there really are some user references from rodata to
- * init code, e.g. drivers/video/vgacon.c:
- *
- * const struct consw vga_con = {
- *        con_startup:            vgacon_startup,
- *
- * where vgacon_startup is __init.  If you want to wade through the false
- * positives, take out the check for rodata.
- **/
-static int init_section_ref_ok(const char *name)
-{
-       const char **s;
-       /* Absolute section names */
-       const char *namelist1[] = {
-               ".init",
-               ".opd",   /* see comment [OPD] at exit_section_ref_ok() */
-               ".toc1",  /* used by ppc64 */
-               ".stab",
-               ".data.rel.ro", /* used by parisc64 */
-               ".parainstructions",
-               ".text.lock",
-               "__bug_table", /* used by powerpc for BUG() */
-               ".pci_fixup_header",
-               ".pci_fixup_final",
-               ".pdr",
-               "__param",
-               "__ex_table",
-               ".fixup",
-               ".smp_locks",
-               ".plt",  /* seen on ARCH=um build on x86_64. Harmless */
-               "__ftr_fixup",          /* powerpc cpu feature fixup */
-               "__fw_ftr_fixup",       /* powerpc firmware feature fixup */
-               NULL
-       };
-       /* Start of section names */
-       const char *namelist2[] = {
-               ".init.",
-               ".altinstructions",
-               ".eh_frame",
-               ".debug",
-               ".parainstructions",
-               ".rodata",
-               NULL
-       };
-       /* part of section name */
-       const char *namelist3 [] = {
-               ".unwind",  /* sample: IA_64.unwind.init.text */
-               NULL
-       };
-
-       for (s = namelist1; *s; s++)
-               if (strcmp(*s, name) == 0)
-                       return 1;
-       for (s = namelist2; *s; s++)
-               if (strncmp(*s, name, strlen(*s)) == 0)
-                       return 1;
-       for (s = namelist3; *s; s++)
-               if (strstr(name, *s) != NULL)
-                       return 1;
-       if (strrcmp(name, ".init") == 0)
-               return 1;
-       return 0;
-}
-
-/*
- * Functions used only during module exit is marked __exit and is stored in
- * a .exit.text section. Likewise data is marked __exitdata and stored in
- * a .exit.data section.
- * If this section is one of these sections return 1
- * See include/linux/init.h for the details
- **/
-static int exit_section(const char *name)
-{
-       if (strcmp(name, ".exit.text") == 0)
-               return 1;
-       if (strcmp(name, ".exit.data") == 0)
-               return 1;
-       return 0;
-
-}
-
-/*
- * Identify sections from which references to a .exit section is OK.
- *
- * [OPD] Keith Ownes <kaos@sgi.com> commented:
- * For our future {in}sanity, add a comment that this is the ppc .opd
- * section, not the ia64 .opd section.
- * ia64 .opd should not point to discarded sections.
- * [.rodata] like for .init.text we ignore .rodata references -same reason
- **/
-static int exit_section_ref_ok(const char *name)
-{
-       const char **s;
-       /* Absolute section names */
-       const char *namelist1[] = {
-               ".exit.text",
-               ".exit.data",
-               ".init.text",
-               ".rodata",
-               ".opd", /* See comment [OPD] */
-               ".toc1",  /* used by ppc64 */
-               ".altinstructions",
-               ".pdr",
-               "__bug_table", /* used by powerpc for BUG() */
-               ".exitcall.exit",
-               ".eh_frame",
-               ".parainstructions",
-               ".stab",
-               "__ex_table",
-               ".fixup",
-               ".smp_locks",
-               ".plt",  /* seen on ARCH=um build on x86_64. Harmless */
-               NULL
-       };
-       /* Start of section names */
-       const char *namelist2[] = {
-               ".debug",
-               NULL
-       };
-       /* part of section name */
-       const char *namelist3 [] = {
-               ".unwind",  /* Sample: IA_64.unwind.exit.text */
-               NULL
-       };
-
-       for (s = namelist1; *s; s++)
-               if (strcmp(*s, name) == 0)
-                       return 1;
-       for (s = namelist2; *s; s++)
-               if (strncmp(*s, name, strlen(*s)) == 0)
-                       return 1;
-       for (s = namelist3; *s; s++)
-               if (strstr(name, *s) != NULL)
-                       return 1;
-       return 0;
-}
-
 static void read_symbols(char *modname)
 {
        const char *symname;
@@ -1146,8 +1276,9 @@ static void read_symbols(char *modname)
                handle_modversions(mod, &info, sym, symname);
                handle_moddevtable(mod, &info, sym, symname);
        }
-       check_sec_ref(mod, modname, &info, init_section, init_section_ref_ok);
-       check_sec_ref(mod, modname, &info, exit_section, exit_section_ref_ok);
+       if (!is_vmlinux(modname) ||
+            (is_vmlinux(modname) && vmlinux_section_warnings))
+               check_sec_ref(mod, modname, &info);
 
        version = get_modinfo(info.modinfo, info.modinfo_len, "version");
        if (version)
@@ -1221,7 +1352,7 @@ static void check_for_gpl_usage(enum export exp, const char *m, const char *s)
        }
 }
 
-static void check_for_unused(enum export exp, const char* m, const char* s)
+static void check_for_unused(enum export exp, const char *m, const char *s)
 {
        const char *e = is_vmlinux(m) ?"":".ko";
 
@@ -1254,7 +1385,7 @@ static void check_exports(struct module *mod)
                if (!mod->gpl_compatible)
                        check_for_gpl_usage(exp->export, basename, exp->name);
                check_for_unused(exp->export, basename, exp->name);
-        }
+       }
 }
 
 /**
@@ -1277,6 +1408,7 @@ static void add_header(struct buffer *b, struct module *mod)
                buf_printf(b, "#ifdef CONFIG_MODULE_UNLOAD\n"
                              " .exit = cleanup_module,\n"
                              "#endif\n");
+       buf_printf(b, " .arch = MODULE_ARCH_INIT,\n");
        buf_printf(b, "};\n");
 }
 
@@ -1292,9 +1424,14 @@ static int add_versions(struct buffer *b, struct module *mod)
                exp = find_symbol(s->name);
                if (!exp || exp->module == mod) {
                        if (have_vmlinux && !s->weak) {
-                               warn("\"%s\" [%s.ko] undefined!\n",
-                                    s->name, mod->name);
-                               err = warn_unresolved ? 0 : 1;
+                               if (warn_unresolved) {
+                                       warn("\"%s\" [%s.ko] undefined!\n",
+                                            s->name, mod->name);
+                               } else {
+                                       merror("\"%s\" [%s.ko] undefined!\n",
+                                                 s->name, mod->name);
+                                       err = 1;
+                               }
                        }
                        continue;
                }
@@ -1312,9 +1449,8 @@ static int add_versions(struct buffer *b, struct module *mod)
        buf_printf(b, "__attribute__((section(\"__versions\"))) = {\n");
 
        for (s = mod->unres; s; s = s->next) {
-               if (!s->module) {
+               if (!s->module)
                        continue;
-               }
                if (!s->crc_valid) {
                        warn("\"%s\" [%s.ko] has no CRC!\n",
                                s->name, mod->name);
@@ -1335,9 +1471,8 @@ static void add_depends(struct buffer *b, struct module *mod,
        struct module *m;
        int first = 1;
 
-       for (m = modules; m; m = m->next) {
+       for (m = modules; m; m = m->next)
                m->seen = is_vmlinux(m->name);
-       }
 
        buf_printf(b, "\n");
        buf_printf(b, "static const char __module_depends[]\n");
@@ -1353,7 +1488,8 @@ static void add_depends(struct buffer *b, struct module *mod,
                        continue;
 
                s->module->seen = 1;
-               if ((p = strrchr(s->module->name, '/')) != NULL)
+               p = strrchr(s->module->name, '/');
+               if (p)
                        p++;
                else
                        p = s->module->name;
@@ -1425,7 +1561,7 @@ static void read_dump(const char *fname, unsigned int kernel)
        void *file = grab_file(fname, &size);
        char *line;
 
-        if (!file)
+       if (!file)
                /* No symbol versions, silently ignore */
                return;
 
@@ -1448,11 +1584,10 @@ static void read_dump(const char *fname, unsigned int kernel)
                crc = strtoul(line, &d, 16);
                if (*symname == '\0' || *modname == '\0' || *d != '\0')
                        goto fail;
-
-               if (!(mod = find_module(modname))) {
-                       if (is_vmlinux(modname)) {
+               mod = find_module(modname);
+               if (!mod) {
+                       if (is_vmlinux(modname))
                                have_vmlinux = 1;
-                       }
                        mod = new_module(NOFAIL(strdup(modname)));
                        mod->skip = 1;
                }
@@ -1503,35 +1638,37 @@ int main(int argc, char **argv)
 {
        struct module *mod;
        struct buffer buf = { };
-       char fname[SZ];
        char *kernel_read = NULL, *module_read = NULL;
        char *dump_write = NULL;
        int opt;
        int err;
 
-       while ((opt = getopt(argc, argv, "i:I:mo:aw")) != -1) {
-               switch(opt) {
-                       case 'i':
-                               kernel_read = optarg;
-                               break;
-                       case 'I':
-                               module_read = optarg;
-                               external_module = 1;
-                               break;
-                       case 'm':
-                               modversions = 1;
-                               break;
-                       case 'o':
-                               dump_write = optarg;
-                               break;
-                       case 'a':
-                               all_versions = 1;
-                               break;
-                       case 'w':
-                               warn_unresolved = 1;
-                               break;
-                       default:
-                               exit(1);
+       while ((opt = getopt(argc, argv, "i:I:mso:aw")) != -1) {
+               switch (opt) {
+               case 'i':
+                       kernel_read = optarg;
+                       break;
+               case 'I':
+                       module_read = optarg;
+                       external_module = 1;
+                       break;
+               case 'm':
+                       modversions = 1;
+                       break;
+               case 'o':
+                       dump_write = optarg;
+                       break;
+               case 'a':
+                       all_versions = 1;
+                       break;
+               case 's':
+                       vmlinux_section_warnings = 0;
+                       break;
+               case 'w':
+                       warn_unresolved = 1;
+                       break;
+               default:
+                       exit(1);
                }
        }
 
@@ -1540,9 +1677,8 @@ int main(int argc, char **argv)
        if (module_read)
                read_dump(module_read, 0);
 
-       while (optind < argc) {
+       while (optind < argc)
                read_symbols(argv[optind++]);
-       }
 
        for (mod = modules; mod; mod = mod->next) {
                if (mod->skip)
@@ -1553,6 +1689,8 @@ int main(int argc, char **argv)
        err = 0;
 
        for (mod = modules; mod; mod = mod->next) {
+               char fname[strlen(mod->name) + 10];
+
                if (mod->skip)
                        continue;