modpost: Fix modpost's license checking V3
[linux-flexiantxendom0.git] / scripts / mod / modpost.c
index 0a80aca..a509ff8 100644 (file)
  * Usage: modpost vmlinux module1.o module2.o ...
  */
 
+#define _GNU_SOURCE
+#include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include "modpost.h"
+#include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
 
+/* Some toolchains use a `_' prefix for all user symbols. */
+#ifdef CONFIG_SYMBOL_PREFIX
+#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
+#else
+#define MODULE_SYMBOL_PREFIX ""
+#endif
+
+
 /* Are we using CONFIG_MODVERSIONS? */
 int modversions = 0;
 /* Warn about undefined symbols? (do so if we have vmlinux) */
@@ -28,6 +40,9 @@ static int vmlinux_section_warnings = 1;
 /* Only warn about unresolved symbols */
 static int warn_unresolved = 0;
 /* How a symbol is exported */
+static int sec_mismatch_count = 0;
+static int sec_mismatch_verbose = 1;
+
 enum export {
        export_plain,      export_unused,     export_gpl,
        export_unused_gpl, export_gpl_future, export_unknown
@@ -239,7 +254,29 @@ static enum export export_no(const char *s)
        return export_unknown;
 }
 
-static enum export export_from_sec(struct elf_info *elf, Elf_Section sec)
+static const char *sec_name(struct elf_info *elf, int secindex);
+
+#define strstarts(str, prefix) (strncmp(str, prefix, strlen(prefix)) == 0)
+
+static enum export export_from_secname(struct elf_info *elf, unsigned int sec)
+{
+       const char *secname = sec_name(elf, sec);
+
+       if (strstarts(secname, "___ksymtab+"))
+               return export_plain;
+       else if (strstarts(secname, "___ksymtab_unused+"))
+               return export_unused;
+       else if (strstarts(secname, "___ksymtab_gpl+"))
+               return export_gpl;
+       else if (strstarts(secname, "___ksymtab_unused_gpl+"))
+               return export_unused_gpl;
+       else if (strstarts(secname, "___ksymtab_gpl_future+"))
+               return export_gpl_future;
+       else
+               return export_unknown;
+}
+
+static enum export export_from_sec(struct elf_info *elf, unsigned int sec)
 {
        if (sec == elf->export_sec)
                return export_plain;
@@ -359,6 +396,8 @@ static int parse_elf(struct elf_info *info, const char *filename)
        Elf_Ehdr *hdr;
        Elf_Shdr *sechdrs;
        Elf_Sym  *sym;
+       const char *secstrings;
+       unsigned int symtab_idx = ~0U, symtab_shndx_idx = ~0U;
 
        hdr = grab_file(filename, &info->size);
        if (!hdr) {
@@ -379,11 +418,19 @@ static int parse_elf(struct elf_info *info, const char *filename)
                return 0;
        }
        /* Fix endianness in ELF header */
-       hdr->e_shoff    = TO_NATIVE(hdr->e_shoff);
-       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);
+       hdr->e_type      = TO_NATIVE(hdr->e_type);
+       hdr->e_machine   = TO_NATIVE(hdr->e_machine);
+       hdr->e_version   = TO_NATIVE(hdr->e_version);
+       hdr->e_entry     = TO_NATIVE(hdr->e_entry);
+       hdr->e_phoff     = TO_NATIVE(hdr->e_phoff);
+       hdr->e_shoff     = TO_NATIVE(hdr->e_shoff);
+       hdr->e_flags     = TO_NATIVE(hdr->e_flags);
+       hdr->e_ehsize    = TO_NATIVE(hdr->e_ehsize);
+       hdr->e_phentsize = TO_NATIVE(hdr->e_phentsize);
+       hdr->e_phnum     = TO_NATIVE(hdr->e_phnum);
+       hdr->e_shentsize = TO_NATIVE(hdr->e_shentsize);
+       hdr->e_shnum     = TO_NATIVE(hdr->e_shnum);
+       hdr->e_shstrndx  = TO_NATIVE(hdr->e_shstrndx);
        sechdrs = (void *)hdr + hdr->e_shoff;
        info->sechdrs = sechdrs;
 
@@ -395,23 +442,43 @@ static int parse_elf(struct elf_info *info, const char *filename)
                return 0;
        }
 
+       if (hdr->e_shnum == SHN_UNDEF) {
+               /*
+                * There are more than 64k sections,
+                * read count from .sh_size.
+                */
+               info->num_sections = TO_NATIVE(sechdrs[0].sh_size);
+       }
+       else {
+               info->num_sections = hdr->e_shnum;
+       }
+       if (hdr->e_shstrndx == SHN_XINDEX) {
+               info->secindex_strings = TO_NATIVE(sechdrs[0].sh_link);
+       }
+       else {
+               info->secindex_strings = hdr->e_shstrndx;
+       }
+
        /* Fix endianness in section headers */
-       for (i = 0; i < hdr->e_shnum; i++) {
-               sechdrs[i].sh_type   = TO_NATIVE(sechdrs[i].sh_type);
-               sechdrs[i].sh_offset = TO_NATIVE(sechdrs[i].sh_offset);
-               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);
+       for (i = 0; i < info->num_sections; i++) {
+               sechdrs[i].sh_name      = TO_NATIVE(sechdrs[i].sh_name);
+               sechdrs[i].sh_type      = TO_NATIVE(sechdrs[i].sh_type);
+               sechdrs[i].sh_flags     = TO_NATIVE(sechdrs[i].sh_flags);
+               sechdrs[i].sh_addr      = TO_NATIVE(sechdrs[i].sh_addr);
+               sechdrs[i].sh_offset    = TO_NATIVE(sechdrs[i].sh_offset);
+               sechdrs[i].sh_size      = TO_NATIVE(sechdrs[i].sh_size);
+               sechdrs[i].sh_link      = TO_NATIVE(sechdrs[i].sh_link);
+               sechdrs[i].sh_info      = TO_NATIVE(sechdrs[i].sh_info);
+               sechdrs[i].sh_addralign = TO_NATIVE(sechdrs[i].sh_addralign);
+               sechdrs[i].sh_entsize   = TO_NATIVE(sechdrs[i].sh_entsize);
        }
        /* Find symbol table. */
-       for (i = 1; i < hdr->e_shnum; i++) {
-               const char *secstrings
-                       = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
+       secstrings = (void *)hdr + sechdrs[info->secindex_strings].sh_offset;
+       for (i = 1; i < info->num_sections; i++) {
                const char *secname;
+               int nobits = sechdrs[i].sh_type == SHT_NOBITS;
 
-               if (sechdrs[i].sh_offset > info->size) {
+               if (!nobits && sechdrs[i].sh_offset > info->size) {
                        fatal("%s is truncated. sechdrs[i].sh_offset=%lu > "
                              "sizeof(*hrd)=%zu\n", filename,
                              (unsigned long)sechdrs[i].sh_offset,
@@ -420,6 +487,8 @@ static int parse_elf(struct elf_info *info, const char *filename)
                }
                secname = secstrings + sechdrs[i].sh_name;
                if (strcmp(secname, ".modinfo") == 0) {
+                       if (nobits)
+                               fatal("%s has NOBITS .modinfo\n", filename);
                        info->modinfo = (void *)hdr + sechdrs[i].sh_offset;
                        info->modinfo_len = sechdrs[i].sh_size;
                } else if (strcmp(secname, "__ksymtab") == 0)
@@ -433,14 +502,26 @@ static int parse_elf(struct elf_info *info, const char *filename)
                else if (strcmp(secname, "__ksymtab_gpl_future") == 0)
                        info->export_gpl_future_sec = i;
 
-               if (sechdrs[i].sh_type != SHT_SYMTAB)
-                       continue;
+               if (sechdrs[i].sh_type == SHT_SYMTAB) {
+                       unsigned int sh_link_idx;
+                       symtab_idx = i;
+                       info->symtab_start = (void *)hdr +
+                           sechdrs[i].sh_offset;
+                       info->symtab_stop  = (void *)hdr +
+                           sechdrs[i].sh_offset + sechdrs[i].sh_size;
+                       sh_link_idx = sechdrs[i].sh_link;
+                       info->strtab       = (void *)hdr +
+                           sechdrs[sh_link_idx].sh_offset;
+               }
 
-               info->symtab_start = (void *)hdr + sechdrs[i].sh_offset;
-               info->symtab_stop  = (void *)hdr + sechdrs[i].sh_offset
-                                                + sechdrs[i].sh_size;
-               info->strtab       = (void *)hdr +
-                                    sechdrs[sechdrs[i].sh_link].sh_offset;
+               /* 32bit section no. table? ("more than 64k sections") */
+               if (sechdrs[i].sh_type == SHT_SYMTAB_SHNDX) {
+                       symtab_shndx_idx = i;
+                       info->symtab_shndx_start = (void *)hdr +
+                           sechdrs[i].sh_offset;
+                       info->symtab_shndx_stop  = (void *)hdr +
+                           sechdrs[i].sh_offset + sechdrs[i].sh_size;
+               }
        }
        if (!info->symtab_start)
                fatal("%s has no symtab?\n", filename);
@@ -452,6 +533,19 @@ static int parse_elf(struct elf_info *info, const char *filename)
                sym->st_value = TO_NATIVE(sym->st_value);
                sym->st_size  = TO_NATIVE(sym->st_size);
        }
+
+       if (symtab_shndx_idx != ~0U) {
+               Elf32_Word *p;
+               if (symtab_idx != sechdrs[symtab_shndx_idx].sh_link)
+                       fatal("%s: SYMTAB_SHNDX has bad sh_link: %u!=%u\n",
+                             filename, sechdrs[symtab_shndx_idx].sh_link,
+                             symtab_idx);
+               /* Fix endianness */
+               for (p = info->symtab_shndx_start; p < info->symtab_shndx_stop;
+                    p++)
+                       *p = TO_NATIVE(*p);
+       }
+
        return 1;
 }
 
@@ -460,6 +554,30 @@ static void parse_elf_finish(struct elf_info *info)
        release_file(info->hdr, info->size);
 }
 
+static int ignore_undef_symbol(struct elf_info *info, const char *symname)
+{
+       /* ignore __this_module, it will be resolved shortly */
+       if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0)
+               return 1;
+       /* ignore global offset table */
+       if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0)
+               return 1;
+       if (info->hdr->e_machine == EM_PPC)
+               /* Special register function linked on all modules during final link of .ko */
+               if (strncmp(symname, "_restgpr_", sizeof("_restgpr_") - 1) == 0 ||
+                   strncmp(symname, "_savegpr_", sizeof("_savegpr_") - 1) == 0 ||
+                   strncmp(symname, "_rest32gpr_", sizeof("_rest32gpr_") - 1) == 0 ||
+                   strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0)
+                       return 1;
+       if (info->hdr->e_machine == EM_PPC64)
+               /* Special register function linked on all modules during final link of .ko */
+               if (strncmp(symname, "_restgpr0_", sizeof("_restgpr0_") - 1) == 0 ||
+                   strncmp(symname, "_savegpr0_", sizeof("_savegpr0_") - 1) == 0)
+                       return 1;
+       /* Do not ignore this symbol */
+       return 0;
+}
+
 #define CRC_PFX     MODULE_SYMBOL_PREFIX "__crc_"
 #define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_"
 
@@ -467,7 +585,12 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                               Elf_Sym *sym, const char *symname)
 {
        unsigned int crc;
-       enum export export = export_from_sec(info, sym->st_shndx);
+       enum export export;
+
+       if (!is_vmlinux(mod->name) && strncmp(symname, "__ksymtab", 9) == 0)
+               export = export_from_secname(info, get_secindex(info, sym));
+       else
+               export = export_from_sec(info, get_secindex(info, sym));
 
        switch (sym->st_shndx) {
        case SHN_COMMON:
@@ -475,7 +598,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                break;
        case SHN_ABS:
                /* CRC'd symbol */
-               if (memcmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
+               if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
                        crc = (unsigned int) sym->st_value;
                        sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
                                        export);
@@ -486,11 +609,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                if (ELF_ST_BIND(sym->st_info) != STB_GLOBAL &&
                    ELF_ST_BIND(sym->st_info) != STB_WEAK)
                        break;
-               /* ignore global offset table */
-               if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0)
-                       break;
-               /* ignore __this_module, it will be resolved shortly */
-               if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0)
+               if (ignore_undef_symbol(info, symname))
                        break;
 /* cope with newer glibc (2.3.4 or higher) STT_ definition in elf.h */
 #if defined(STT_REGISTER) || defined(STT_SPARC_REGISTER)
@@ -523,7 +642,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                break;
        default:
                /* All exported symbols */
-               if (memcmp(symname, KSYMTAB_PFX, strlen(KSYMTAB_PFX)) == 0) {
+               if (strncmp(symname, KSYMTAB_PFX, strlen(KSYMTAB_PFX)) == 0) {
                        sym_add_exported(symname + strlen(KSYMTAB_PFX), mod,
                                        export);
                }
@@ -610,22 +729,22 @@ static const char *sym_name(struct elf_info *elf, Elf_Sym *sym)
        if (sym)
                return elf->strtab + sym->st_name;
        else
-               return "";
+               return "(unknown)";
 }
 
-static const char *sec_name(struct elf_info *elf, int shndx)
+static const char *sec_name(struct elf_info *elf, int secindex)
 {
        Elf_Shdr *sechdrs = elf->sechdrs;
        return (void *)elf->hdr +
-               elf->sechdrs[elf->hdr->e_shstrndx].sh_offset +
-               sechdrs[shndx].sh_name;
+               elf->sechdrs[elf->secindex_strings].sh_offset +
+               sechdrs[secindex].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;
+               elf->sechdrs[elf->secindex_strings].sh_offset +
+               sechdr->sh_name;
 }
 
 /* if sym is empty or point to a string
@@ -655,7 +774,7 @@ static int number_prefix(const char *sym)
  *   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[])
+static int match(const char *sym, const char * const pat[])
 {
        const char *p;
        while (*pat) {
@@ -691,9 +810,46 @@ int match(const char *sym, const char * const pat[])
 
 /* 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 };
+{
+       ".comment*",
+       ".debug*",
+       ".zdebug*",             /* Compressed debug sections. */
+       ".GCC-command-line",    /* mn10300 */
+       ".mdebug*",        /* alpha, score, mips etc. */
+       ".pdr",            /* alpha, score, mips etc. */
+       ".stab*",
+       ".note*",
+       ".got*",
+       ".toc*",
+       NULL
+};
+
+/*
+ * This is used to find sections missing the SHF_ALLOC flag.
+ * The cause of this is often a section specified in assembler
+ * without "ax" / "aw".
+ */
+static void check_section(const char *modname, struct elf_info *elf,
+                          Elf_Shdr *sechdr)
+{
+       const char *sec = sech_name(elf, sechdr);
+
+       if (sechdr->sh_type == SHT_PROGBITS &&
+           !(sechdr->sh_flags & SHF_ALLOC) &&
+           !match(sec, section_white_list)) {
+               warn("%s (%s): unexpected non-allocatable section.\n"
+                    "Did you forget to use \"ax\"/\"aw\" in a .S file?\n"
+                    "Note that for example <linux/init.h> contains\n"
+                    "section definitions for use in .S files.\n\n",
+                    modname, sec);
+       }
+}
+
+
 
 #define ALL_INIT_DATA_SECTIONS \
+       ".init.setup$", ".init.rodata$", \
+       ".devinit.rodata$", ".cpuinit.rodata$", ".meminit.rodata$" \
        ".init.data$", ".devinit.data$", ".cpuinit.data$", ".meminit.data$"
 #define ALL_EXIT_DATA_SECTIONS \
        ".exit.data$", ".devexit.data$", ".cpuexit.data$", ".memexit.data$"
@@ -703,21 +859,26 @@ static const char *section_white_list[] =
 #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 ALL_XXXINIT_SECTIONS DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, \
+       MEM_INIT_SECTIONS
+#define ALL_XXXEXIT_SECTIONS DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, \
+       MEM_EXIT_SECTIONS
+
+#define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS
+#define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_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 INIT_SECTIONS      ".init.*"
+#define DEV_INIT_SECTIONS  ".devinit.*"
+#define CPU_INIT_SECTIONS  ".cpuinit.*"
+#define MEM_INIT_SECTIONS  ".meminit.*"
 
-#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$"
+#define EXIT_SECTIONS      ".exit.*"
+#define DEV_EXIT_SECTIONS  ".devexit.*"
+#define CPU_EXIT_SECTIONS  ".cpuexit.*"
+#define MEM_EXIT_SECTIONS  ".memexit.*"
 
 /* init data sections */
 static const char *init_data_sections[] = { ALL_INIT_DATA_SECTIONS, NULL };
@@ -732,37 +893,39 @@ static const char *init_exit_sections[] =
 /* 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
-};
+#define DEFAULT_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"
 
 static const char *head_sections[] = { ".head.text*", NULL };
 static const char *linker_symbols[] =
        { "__init_begin", "_sinittext", "_einittext", NULL };
 
+enum mismatch {
+       TEXT_TO_ANY_INIT,
+       DATA_TO_ANY_INIT,
+       TEXT_TO_ANY_EXIT,
+       DATA_TO_ANY_EXIT,
+       XXXINIT_TO_SOME_INIT,
+       XXXEXIT_TO_SOME_EXIT,
+       ANY_INIT_TO_ANY_EXIT,
+       ANY_EXIT_TO_ANY_INIT,
+       EXPORT_TO_INIT_EXIT,
+};
+
 struct sectioncheck {
        const char *fromsec[20];
        const char *tosec[20];
+       enum mismatch mismatch;
+       const char *symbol_white_list[20];
 };
 
 const struct sectioncheck sectioncheck[] = {
@@ -770,37 +933,105 @@ const struct sectioncheck sectioncheck[] = {
  * normal code and data
  */
 {
-       .fromsec = { TEXT_SECTIONS, DATA_SECTIONS, NULL },
-       .tosec   = { ALL_INIT_SECTIONS, ALL_EXIT_SECTIONS, NULL }
+       .fromsec = { TEXT_SECTIONS, NULL },
+       .tosec   = { ALL_INIT_SECTIONS, NULL },
+       .mismatch = TEXT_TO_ANY_INIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
+},
+{
+       .fromsec = { DATA_SECTIONS, NULL },
+       .tosec   = { ALL_XXXINIT_SECTIONS, NULL },
+       .mismatch = DATA_TO_ANY_INIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
+},
+{
+       .fromsec = { DATA_SECTIONS, NULL },
+       .tosec   = { INIT_SECTIONS, NULL },
+       .mismatch = DATA_TO_ANY_INIT,
+       .symbol_white_list = {
+               "*_template", "*_timer", "*_sht", "*_ops",
+               "*_probe", "*_probe_one", "*_console", NULL
+       },
+},
+{
+       .fromsec = { TEXT_SECTIONS, NULL },
+       .tosec   = { ALL_EXIT_SECTIONS, NULL },
+       .mismatch = TEXT_TO_ANY_EXIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
+},
+{
+       .fromsec = { DATA_SECTIONS, NULL },
+       .tosec   = { ALL_EXIT_SECTIONS, NULL },
+       .mismatch = DATA_TO_ANY_EXIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, 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 }
+       .fromsec = { ALL_XXXINIT_SECTIONS, NULL },
+       .tosec   = { INIT_SECTIONS, NULL },
+       .mismatch = XXXINIT_TO_SOME_INIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
+},
+/* Do not reference cpuinit code/data from meminit code/data */
+{
+       .fromsec = { MEM_INIT_SECTIONS, NULL },
+       .tosec   = { CPU_INIT_SECTIONS, NULL },
+       .mismatch = XXXINIT_TO_SOME_INIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
+},
+/* Do not reference meminit code/data from cpuinit code/data */
+{
+       .fromsec = { CPU_INIT_SECTIONS, NULL },
+       .tosec   = { MEM_INIT_SECTIONS, NULL },
+       .mismatch = XXXINIT_TO_SOME_INIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, 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 }
+       .fromsec = { ALL_XXXEXIT_SECTIONS, NULL },
+       .tosec   = { EXIT_SECTIONS, NULL },
+       .mismatch = XXXEXIT_TO_SOME_EXIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
+},
+/* Do not reference cpuexit code/data from memexit code/data */
+{
+       .fromsec = { MEM_EXIT_SECTIONS, NULL },
+       .tosec   = { CPU_EXIT_SECTIONS, NULL },
+       .mismatch = XXXEXIT_TO_SOME_EXIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
+},
+/* Do not reference memexit code/data from cpuexit code/data */
+{
+       .fromsec = { CPU_EXIT_SECTIONS, NULL },
+       .tosec   = { MEM_EXIT_SECTIONS, NULL },
+       .mismatch = XXXEXIT_TO_SOME_EXIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not use exit code/data from init code */
 {
        .fromsec = { ALL_INIT_SECTIONS, NULL },
        .tosec   = { ALL_EXIT_SECTIONS, NULL },
+       .mismatch = ANY_INIT_TO_ANY_EXIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not use init code/data from exit code */
 {
        .fromsec = { ALL_EXIT_SECTIONS, NULL },
-       .tosec   = { ALL_INIT_SECTIONS, NULL }
+       .tosec   = { ALL_INIT_SECTIONS, NULL },
+       .mismatch = ANY_EXIT_TO_ANY_INIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not export init/exit functions or data */
 {
        .fromsec = { "__ksymtab*", NULL },
-       .tosec   = { ALL_INIT_SECTIONS, ALL_EXIT_SECTIONS, NULL }
+       .tosec   = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
+       .mismatch = EXPORT_TO_INIT_EXIT,
+       .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 }
 };
 
-static int section_mismatch(const char *fromsec, const char *tosec)
+static const struct sectioncheck *section_mismatch(
+               const char *fromsec, const char *tosec)
 {
        int i;
        int elems = sizeof(sectioncheck) / sizeof(struct sectioncheck);
@@ -809,20 +1040,15 @@ static int section_mismatch(const char *fromsec, const char *tosec)
        for (i = 0; i < elems; i++) {
                if (match(fromsec, check->fromsec) &&
                    match(tosec, check->tosec))
-                       return 1;
+                       return check;
                check++;
        }
-       return 0;
+       return NULL;
 }
 
 /**
  * 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.
@@ -833,10 +1059,17 @@ static int section_mismatch(const char *fromsec, const char *tosec)
  *   fromsec = .data*
  *   atsym   =__param*
  *
+ * Pattern 1a:
+ *   module_param_call() ops can refer to __init set function if permissions=0
+ *   The pattern is identified by:
+ *   tosec   = .init.text
+ *   fromsec = .data*
+ *   atsym   = __param_ops_*
+ *
  * Pattern 2:
  *   Many drivers utilise a *driver container with references to
  *   add, remove, probe functions etc.
- *   These functions may often be marked __init and we do not want to
+ *   These functions may often be marked __devinit and we do not want to
  *   warn here.
  *   the pattern is identified by:
  *   tosec   = init or exit section
@@ -845,8 +1078,7 @@ static int section_mismatch(const char *fromsec, const char *tosec)
  *           *probe_one, *_console, *_timer
  *
  * Pattern 3:
- *   Whitelist all refereces from .text.head to .init.data
- *   Whitelist all refereces from .text.head to .init.text
+ *   Whitelist all references from .head.text to any init section
  *
  * Pattern 4:
  *   Some symbols belong to init section but still it is ok to reference
@@ -858,23 +1090,26 @@ static int section_mismatch(const char *fromsec, const char *tosec)
  *   refsymname = __init_begin, _sinittext, _einittext
  *
  **/
-static int secref_whitelist(const char *fromsec, const char *fromsym,
+static int secref_whitelist(const struct sectioncheck *mismatch,
+                           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 (match(tosec, init_data_sections) &&
            match(fromsec, data_sections) &&
            (strncmp(fromsym, "__param", strlen("__param")) == 0))
                return 0;
 
+       /* Check for pattern 1a */
+       if (strcmp(tosec, ".init.text") == 0 &&
+           match(fromsec, data_sections) &&
+           (strncmp(fromsym, "__param_ops_", strlen("__param_ops_")) == 0))
+               return 0;
+
        /* Check for pattern 2 */
        if (match(tosec, init_exit_sections) &&
            match(fromsec, data_sections) &&
-           match(fromsym, symbol_white_list))
+           match(fromsym, mismatch->symbol_white_list))
                return 0;
 
        /* Check for pattern 3 */
@@ -903,11 +1138,14 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
        Elf_Sym *near = NULL;
        Elf64_Sword distance = 20;
        Elf64_Sword d;
+       unsigned int relsym_secindex;
 
        if (relsym->st_name != 0)
                return relsym;
+
+       relsym_secindex = get_secindex(elf, relsym);
        for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) {
-               if (sym->st_shndx != relsym->st_shndx)
+               if (get_secindex(elf, sym) != relsym_secindex)
                        continue;
                if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
                        continue;
@@ -969,9 +1207,9 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr,
        for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) {
                const char *symsec;
 
-               if (sym->st_shndx >= SHN_LORESERVE)
+               if (is_shndx_special(sym->st_shndx))
                        continue;
-               symsec = sec_name(elf, sym->st_shndx);
+               symsec = sec_name(elf, get_secindex(elf, sym));
                if (strcmp(symsec, sec) != 0)
                        continue;
                if (!is_valid_name(elf, sym))
@@ -989,47 +1227,240 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr,
 }
 
 /*
+ * Convert a section name to the function/data attribute
+ * .init.text => __init
+ * .cpuinit.data => __cpudata
+ * .memexitconst => __memconst
+ * etc.
+ *
+ * The memory of returned value has been allocated on a heap. The user of this
+ * method should free it after usage.
+*/
+static char *sec2annotation(const char *s)
+{
+       if (match(s, init_exit_sections)) {
+               char *p = malloc(20);
+               char *r = p;
+
+               *p++ = '_';
+               *p++ = '_';
+               if (*s == '.')
+                       s++;
+               while (*s && *s != '.')
+                       *p++ = *s++;
+               *p = '\0';
+               if (*s == '.')
+                       s++;
+               if (strstr(s, "rodata") != NULL)
+                       strcat(p, "const ");
+               else if (strstr(s, "data") != NULL)
+                       strcat(p, "data ");
+               else
+                       strcat(p, " ");
+               return r;
+       } else {
+               return strdup("");
+       }
+}
+
+static int is_function(Elf_Sym *sym)
+{
+       if (sym)
+               return ELF_ST_TYPE(sym->st_info) == STT_FUNC;
+       else
+               return -1;
+}
+
+static void print_section_list(const char * const list[20])
+{
+       const char *const *s = list;
+
+       while (*s) {
+               fprintf(stderr, "%s", *s);
+               s++;
+               if (*s)
+                       fprintf(stderr, ", ");
+       }
+       fprintf(stderr, "\n");
+}
+
+/*
  * 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 report_sec_mismatch(const char *modname,
+                               const struct sectioncheck *mismatch,
                                 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);
+                                int from_is_func,
+                                const char *tosec, const char *tosym,
+                                int to_is_func)
+{
+       const char *from, *from_p;
+       const char *to, *to_p;
+       char *prl_from;
+       char *prl_to;
+
+       switch (from_is_func) {
+       case 0: from = "variable"; from_p = "";   break;
+       case 1: from = "function"; from_p = "()"; break;
+       default: from = "(unknown reference)"; from_p = ""; break;
+       }
+       switch (to_is_func) {
+       case 0: to = "variable"; to_p = "";   break;
+       case 1: to = "function"; to_p = "()"; break;
+       default: to = "(unknown reference)"; to_p = ""; break;
+       }
+
+       sec_mismatch_count++;
+       if (!sec_mismatch_verbose)
+               return;
+
+       warn("%s(%s+0x%llx): Section mismatch in reference from the %s %s%s "
+            "to the %s %s:%s%s\n",
+            modname, fromsec, fromaddr, from, fromsym, from_p, to, tosec,
+            tosym, to_p);
+
+       switch (mismatch->mismatch) {
+       case TEXT_TO_ANY_INIT:
+               prl_from = sec2annotation(fromsec);
+               prl_to = sec2annotation(tosec);
+               fprintf(stderr,
+               "The function %s%s() references\n"
+               "the %s %s%s%s.\n"
+               "This is often because %s lacks a %s\n"
+               "annotation or the annotation of %s is wrong.\n",
+               prl_from, fromsym,
+               to, prl_to, tosym, to_p,
+               fromsym, prl_to, tosym);
+               free(prl_from);
+               free(prl_to);
+               break;
+       case DATA_TO_ANY_INIT: {
+               prl_to = sec2annotation(tosec);
+               fprintf(stderr,
+               "The variable %s references\n"
+               "the %s %s%s%s\n"
+               "If the reference is valid then annotate the\n"
+               "variable with __init* or __refdata (see linux/init.h) "
+               "or name the variable:\n",
+               fromsym, to, prl_to, tosym, to_p);
+               print_section_list(mismatch->symbol_white_list);
+               free(prl_to);
+               break;
        }
+       case TEXT_TO_ANY_EXIT:
+               prl_to = sec2annotation(tosec);
+               fprintf(stderr,
+               "The function %s() references a %s in an exit section.\n"
+               "Often the %s %s%s has valid usage outside the exit section\n"
+               "and the fix is to remove the %sannotation of %s.\n",
+               fromsym, to, to, tosym, to_p, prl_to, tosym);
+               free(prl_to);
+               break;
+       case DATA_TO_ANY_EXIT: {
+               prl_to = sec2annotation(tosec);
+               fprintf(stderr,
+               "The variable %s references\n"
+               "the %s %s%s%s\n"
+               "If the reference is valid then annotate the\n"
+               "variable with __exit* (see linux/init.h) or "
+               "name the variable:\n",
+               fromsym, to, prl_to, tosym, to_p);
+               print_section_list(mismatch->symbol_white_list);
+               free(prl_to);
+               break;
+       }
+       case XXXINIT_TO_SOME_INIT:
+       case XXXEXIT_TO_SOME_EXIT:
+               prl_from = sec2annotation(fromsec);
+               prl_to = sec2annotation(tosec);
+               fprintf(stderr,
+               "The %s %s%s%s references\n"
+               "a %s %s%s%s.\n"
+               "If %s is only used by %s then\n"
+               "annotate %s with a matching annotation.\n",
+               from, prl_from, fromsym, from_p,
+               to, prl_to, tosym, to_p,
+               tosym, fromsym, tosym);
+               free(prl_from);
+               free(prl_to);
+               break;
+       case ANY_INIT_TO_ANY_EXIT:
+               prl_from = sec2annotation(fromsec);
+               prl_to = sec2annotation(tosec);
+               fprintf(stderr,
+               "The %s %s%s%s references\n"
+               "a %s %s%s%s.\n"
+               "This is often seen when error handling "
+               "in the init function\n"
+               "uses functionality in the exit path.\n"
+               "The fix is often to remove the %sannotation of\n"
+               "%s%s so it may be used outside an exit section.\n",
+               from, prl_from, fromsym, from_p,
+               to, prl_to, tosym, to_p,
+               prl_to, tosym, to_p);
+               free(prl_from);
+               free(prl_to);
+               break;
+       case ANY_EXIT_TO_ANY_INIT:
+               prl_from = sec2annotation(fromsec);
+               prl_to = sec2annotation(tosec);
+               fprintf(stderr,
+               "The %s %s%s%s references\n"
+               "a %s %s%s%s.\n"
+               "This is often seen when error handling "
+               "in the exit function\n"
+               "uses functionality in the init path.\n"
+               "The fix is often to remove the %sannotation of\n"
+               "%s%s so it may be used outside an init section.\n",
+               from, prl_from, fromsym, from_p,
+               to, prl_to, tosym, to_p,
+               prl_to, tosym, to_p);
+               free(prl_from);
+               free(prl_to);
+               break;
+       case EXPORT_TO_INIT_EXIT:
+               prl_to = sec2annotation(tosec);
+               fprintf(stderr,
+               "The symbol %s is exported and annotated %s\n"
+               "Fix this by removing the %sannotation of %s "
+               "or drop the export.\n",
+               tosym, prl_to, prl_to, tosym);
+               free(prl_to);
+               break;
+       }
+       fprintf(stderr, "\n");
 }
 
 static void check_section_mismatch(const char *modname, struct elf_info *elf,
                                    Elf_Rela *r, Elf_Sym *sym, const char *fromsec)
 {
        const char *tosec;
+       const struct sectioncheck *mismatch;
 
-       tosec = sec_name(elf, sym->st_shndx);
-       if (section_mismatch(fromsec, tosec)) {
-               const char *fromsym;
+       tosec = sec_name(elf, get_secindex(elf, sym));
+       mismatch = section_mismatch(fromsec, tosec);
+       if (mismatch) {
+               Elf_Sym *to;
+               Elf_Sym *from;
                const char *tosym;
+               const char *fromsym;
 
-               fromsym = sym_name(elf,
-                         find_elf_symbol2(elf, r->r_offset, fromsec));
-               tosym = sym_name(elf,
-                       find_elf_symbol(elf, r->r_addend, sym));
+               from = find_elf_symbol2(elf, r->r_offset, fromsec);
+               fromsym = sym_name(elf, from);
+               to = find_elf_symbol(elf, r->r_addend, sym);
+               tosym = sym_name(elf, to);
 
                /* check whitelist - we may ignore it */
-               if (secref_whitelist(fromsec, fromsym, tosec, tosym)) {
-                       report_sec_mismatch(modname, fromsec, r->r_offset,
-                                           fromsym, tosec, tosym);
+               if (secref_whitelist(mismatch,
+                                       fromsec, fromsym, tosec, tosym)) {
+                       report_sec_mismatch(modname, mismatch,
+                          fromsec, r->r_offset, fromsym,
+                          is_function(from), tosec, tosym,
+                          is_function(to));
                }
        }
 }
@@ -1041,7 +1472,7 @@ static unsigned int *reloc_location(struct elf_info *elf,
        int section = sechdr->sh_info;
 
        return (void *)elf->hdr + sechdrs[section].sh_offset +
-               (r->r_offset - sechdrs[section].sh_addr);
+               r->r_offset;
 }
 
 static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
@@ -1125,6 +1556,7 @@ static void section_rela(const char *modname, struct elf_info *elf,
        /* 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
@@ -1145,7 +1577,7 @@ static void section_rela(const char *modname, struct elf_info *elf,
                r.r_addend = TO_NATIVE(rela->r_addend);
                sym = elf->symtab_start + r_sym;
                /* Skip special sections */
-               if (sym->st_shndx >= SHN_LORESERVE)
+               if (is_shndx_special(sym->st_shndx))
                        continue;
                check_section_mismatch(modname, elf, &r, sym, fromsec);
        }
@@ -1203,7 +1635,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
                }
                sym = elf->symtab_start + r_sym;
                /* Skip special sections */
-               if (sym->st_shndx >= SHN_LORESERVE)
+               if (is_shndx_special(sym->st_shndx))
                        continue;
                check_section_mismatch(modname, elf, &r, sym, fromsec);
        }
@@ -1213,10 +1645,10 @@ static void section_rel(const char *modname, struct elf_info *elf,
  * A module includes a number of sections that are discarded
  * either when loaded or when used as built-in.
  * For loaded modules all functions marked __init and all data
- * marked __initdata will be discarded when the module has been intialized.
+ * marked __initdata will be discarded when the module has been initialized.
  * Likewise for modules used built-in the sections marked __exit
  * are discarded because __exit marked function are supposed to be called
- * only when a moduel is unloaded which never happes for built-in modules.
+ * only when a module is unloaded which never happens for built-in modules.
  * The check_sec_ref() function traverses all relocation records
  * to find all references to a section that reference a section that will
  * be discarded and warns about it.
@@ -1228,7 +1660,8 @@ static void check_sec_ref(struct module *mod, const char *modname,
        Elf_Shdr *sechdrs = elf->sechdrs;
 
        /* Walk through all sections */
-       for (i = 0; i < elf->hdr->e_shnum; i++) {
+       for (i = 0; i < elf->num_sections; i++) {
+               check_section(modname, elf, &elf->sechdrs[i]);
                /* We want to process only relocation sections and not .init */
                if (sechdrs[i].sh_type == SHT_RELA)
                        section_rela(modname, elf, &elf->sechdrs[i]);
@@ -1259,6 +1692,10 @@ static void read_symbols(char *modname)
        }
 
        license = get_modinfo(info.modinfo, info.modinfo_len, "license");
+       if (info.modinfo && !license && !is_vmlinux(modname))
+               warn("modpost: missing MODULE_LICENSE() in %s\n"
+                    "see include/linux/module.h for "
+                    "more information\n", modname);
        while (license) {
                if (license_is_gpl_compatible(license))
                        mod->gpl_compatible = 1;
@@ -1290,12 +1727,12 @@ static void read_symbols(char *modname)
 
        parse_elf_finish(&info);
 
-       /* Our trick to get versioning for struct_module - it's
+       /* Our trick to get versioning for module struct etc. - it's
         * never passed as an argument to an exported function, so
         * the automatic versioning doesn't pick it up, but it's really
         * important anyhow */
        if (modversions)
-               mod->unres = alloc_symbol("struct_module", 0, mod->unres);
+               mod->unres = alloc_symbol("module_layout", 0, mod->unres);
 }
 
 #define SZ 500
@@ -1412,6 +1849,14 @@ static void add_header(struct buffer *b, struct module *mod)
        buf_printf(b, "};\n");
 }
 
+static void add_staging_flag(struct buffer *b, const char *name)
+{
+       static const char *staging_dir = "drivers/staging";
+
+       if (strncmp(staging_dir, name, strlen(staging_dir)) == 0)
+               buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
+}
+
 /**
  * Record CRCs for unresolved symbols
  **/
@@ -1445,7 +1890,7 @@ static int add_versions(struct buffer *b, struct module *mod)
 
        buf_printf(b, "\n");
        buf_printf(b, "static const struct modversion_info ____versions[]\n");
-       buf_printf(b, "__attribute_used__\n");
+       buf_printf(b, "__used\n");
        buf_printf(b, "__attribute__((section(\"__versions\"))) = {\n");
 
        for (s = mod->unres; s; s = s->next) {
@@ -1476,7 +1921,7 @@ static void add_depends(struct buffer *b, struct module *mod,
 
        buf_printf(b, "\n");
        buf_printf(b, "static const char __module_depends[]\n");
-       buf_printf(b, "__attribute_used__\n");
+       buf_printf(b, "__used\n");
        buf_printf(b, "__attribute__((section(\".modinfo\"))) =\n");
        buf_printf(b, "\"depends=");
        for (s = mod->unres; s; s = s->next) {
@@ -1588,7 +2033,7 @@ static void read_dump(const char *fname, unsigned int kernel)
                if (!mod) {
                        if (is_vmlinux(modname))
                                have_vmlinux = 1;
-                       mod = new_module(NOFAIL(strdup(modname)));
+                       mod = new_module(modname);
                        mod->skip = 1;
                }
                s = sym_add_exported(symname, mod, export_no(export));
@@ -1634,6 +2079,11 @@ static void write_dump(const char *fname)
        write_if_changed(&buf, fname);
 }
 
+struct ext_sym_list {
+       struct ext_sym_list *next;
+       const char *file;
+};
+
 int main(int argc, char **argv)
 {
        struct module *mod;
@@ -1642,8 +2092,10 @@ int main(int argc, char **argv)
        char *dump_write = NULL;
        int opt;
        int err;
+       struct ext_sym_list *extsym_iter;
+       struct ext_sym_list *extsym_start = NULL;
 
-       while ((opt = getopt(argc, argv, "i:I:mso:aw")) != -1) {
+       while ((opt = getopt(argc, argv, "i:I:e:cmsSo:awM:K:")) != -1) {
                switch (opt) {
                case 'i':
                        kernel_read = optarg;
@@ -1652,6 +2104,17 @@ int main(int argc, char **argv)
                        module_read = optarg;
                        external_module = 1;
                        break;
+               case 'c':
+                       cross_build = 1;
+                       break;
+               case 'e':
+                       external_module = 1;
+                       extsym_iter =
+                          NOFAIL(malloc(sizeof(*extsym_iter)));
+                       extsym_iter->next = extsym_start;
+                       extsym_iter->file = optarg;
+                       extsym_start = extsym_iter;
+                       break;
                case 'm':
                        modversions = 1;
                        break;
@@ -1664,6 +2127,9 @@ int main(int argc, char **argv)
                case 's':
                        vmlinux_section_warnings = 0;
                        break;
+               case 'S':
+                       sec_mismatch_verbose = 0;
+                       break;
                case 'w':
                        warn_unresolved = 1;
                        break;
@@ -1676,6 +2142,12 @@ int main(int argc, char **argv)
                read_dump(kernel_read, 1);
        if (module_read)
                read_dump(module_read, 0);
+       while (extsym_start) {
+               read_dump(extsym_start->file, 0);
+               extsym_iter = extsym_start->next;
+               free(extsym_start);
+               extsym_start = extsym_iter;
+       }
 
        while (optind < argc)
                read_symbols(argv[optind++]);
@@ -1697,6 +2169,7 @@ int main(int argc, char **argv)
                buf.pos = 0;
 
                add_header(&buf, mod);
+               add_staging_flag(&buf, mod->name);
                err |= add_versions(&buf, mod);
                add_depends(&buf, mod, modules);
                add_moddevtable(&buf, mod);
@@ -1708,6 +2181,11 @@ int main(int argc, char **argv)
 
        if (dump_write)
                write_dump(dump_write);
+       if (sec_mismatch_count && !sec_mismatch_verbose)
+               warn("modpost: Found %d section mismatch(es).\n"
+                    "To see full details build your kernel with:\n"
+                    "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
+                    sec_mismatch_count);
 
        return err;
 }