14 files changed, 239 insertions, 122 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 0e801c3cdaf8..d5d859c80729 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -211,7 +211,8 @@ $(obj)/%.i: $(src)/%.c FORCE
 
 cmd_gensymtypes =                                                           \
     $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
-    $(GENKSYMS) $(if $(1), -T $(2)) -a $(ARCH)                              \
+    $(GENKSYMS) $(if $(1), -T $(2))                                         \
+     $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))             \
      $(if $(KBUILD_PRESERVE),-p)                                            \
      -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
 
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 07125e697d7a..51bb3de680b6 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -119,13 +119,6 @@ _c_flags += $(if $(patsubst n%,, \
                 $(CFLAGS_GCOV))
 endif
 
-ifdef CONFIG_SYMBOL_PREFIX
-_sym_flags = -DSYMBOL_PREFIX=$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))
-_cpp_flags += $(_sym_flags)
-_a_flags += $(_sym_flags)
-endif
-
-
 # If building the kernel in a separate objtree expand all occurrences
 # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
 
@@ -156,9 +149,9 @@ cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 
 ld_flags       = $(LDFLAGS) $(ldflags-y)
 
-dtc_cpp_flags  = -Wp,-MD,$(depfile) -nostdinc                            \
+dtc_cpp_flags  = -Wp,-MD,$(depfile).pre -nostdinc                        \
                  -I$(srctree)/arch/$(SRCARCH)/boot/dts                   \
-                 -I$(srctree)/arch/$(SRCARCH)/include/dts                \
+                 -I$(srctree)/arch/$(SRCARCH)/boot/dts/include           \
                  -undef -D__DTS__
 
 # Finds the multi-part object the current object will be linked into
@@ -269,20 +262,17 @@ $(obj)/%.dtb.S: $(obj)/%.dtb
         $(call cmd,dt_S_dtb)
 
 quiet_cmd_dtc = DTC     $@
-cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $<
+cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+        $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \
+                -i $(srctree)/arch/$(SRCARCH)/boot/dts $(DTC_FLAGS) \
+                -d $(depfile).dtc $(dtc-tmp) ; \
+        cat $(depfile).pre $(depfile).dtc > $(depfile)
 
 $(obj)/%.dtb: $(src)/%.dts FORCE
         $(call if_changed_dep,dtc)
 
 dtc-tmp = $(subst $(comma),_,$(dot-target).dts)
 
-quiet_cmd_dtc_cpp = DTC+CPP $@
-cmd_dtc_cpp = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
-        $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $(dtc-tmp)
-
-$(obj)/%.dtb: $(src)/%.dtsp FORCE
-        $(call if_changed_dep,dtc_cpp)
-
 # Bzip2
 # ---------------------------------------------------------------------------
 
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index cf82c832458f..8dcdca27d836 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -60,7 +60,8 @@ kernelsymfile := $(objtree)/Module.symvers
 modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers
 
 # Step 1), find all modules listed in $(MODVERDIR)/
-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
+MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u
+__modules := $(shell $(MODLISTCMD))
 modules   := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))
 
 # Stop after building .o files if NOFINAL is set. Makes compile tests quicker
@@ -78,12 +79,13 @@ modpost = scripts/mod/modpost                    \
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
 
+# We can go over command line length here, so be careful.
 quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
-      cmd_modpost = $(modpost) -s
+      cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) -s -T -
 
 PHONY += __modpost
 __modpost: $(modules:.ko=.o) FORCE
-        $(call cmd,modpost) $(wildcard vmlinux) $(filter-out FORCE,$^)
+        $(call cmd,modpost) $(wildcard vmlinux)
 
 quiet_cmd_kernel-mod = MODPOST $@
       cmd_kernel-mod = $(modpost) $@
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 7f6425e24ce3..078fe1d64e7d 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -320,49 +320,78 @@ static void parse_dep_file(void *map, size_t len)
         char *end = m + len;
         char *p;
         char s[PATH_MAX];
-        int first;
-
-        p = strchr(m, ':');
-        if (!p) {
-                fprintf(stderr, "fixdep: parse error\n");
-                exit(1);
-        }
-        memcpy(s, m, p-m); s[p-m] = 0;
-        m = p+1;
+        int is_target;
+        int saw_any_target = 0;
+        int is_first_dep = 0;
 
         clear_config();
 
-        first = 1;
         while (m < end) {
+                /* Skip any "white space" */
                 while (m < end && (*m == ' ' || *m == '\\' || *m == '\n'))
                         m++;
+                /* Find next "white space" */
                 p = m;
-                while (p < end && *p != ' ') p++;
-                if (p == end) {
-                        do p--; while (!isalnum(*p));
+                while (p < end && *p != ' ' && *p != '\\' && *p != '\n')
                         p++;
+                /* Is the token we found a target name? */
+                is_target = (*(p-1) == ':');
+                /* Don't write any target names into the dependency file */
+                if (is_target) {
+                        /* The /next/ file is the first dependency */
+                        is_first_dep = 1;
+                } else {
+                        /* Save this token/filename */
+                        memcpy(s, m, p-m);
+                        s[p - m] = 0;
+
+                        /* Ignore certain dependencies */
+                        if (strrcmp(s, "include/generated/autoconf.h") &&
+                            strrcmp(s, "arch/um/include/uml-config.h") &&
+                            strrcmp(s, "include/linux/kconfig.h") &&
+                            strrcmp(s, ".ver")) {
+                                /*
+                                 * Do not list the source file as dependency,
+                                 * so that kbuild is not confused if a .c file
+                                 * is rewritten into .S or vice versa. Storing
+                                 * it in source_* is needed for modpost to
+                                 * compute srcversions.
+                                 */
+                                if (is_first_dep) {
+                                        /*
+                                         * If processing the concatenation of
+                                         * multiple dependency files, only
+                                         * process the first target name, which
+                                         * will be the original source name,
+                                         * and ignore any other target names,
+                                         * which will be intermediate temporary
+                                         * files.
+                                         */
+                                        if (!saw_any_target) {
+                                                saw_any_target = 1;
+                                                printf("source_%s := %s\n\n",
+                                                        target, s);
+                                                printf("deps_%s := \\\n",
+                                                        target);
+                                        }
+                                        is_first_dep = 0;
+                                } else
+                                        printf("  %s \\\n", s);
+                                do_config_file(s);
+                        }
                 }
-                memcpy(s, m, p-m); s[p-m] = 0;
-                if (strrcmp(s, "include/generated/autoconf.h") &&
-                    strrcmp(s, "arch/um/include/uml-config.h") &&
-                    strrcmp(s, "include/linux/kconfig.h") &&
-                    strrcmp(s, ".ver")) {
-                        /*
-                         * Do not list the source file as dependency, so that
-                         * kbuild is not confused if a .c file is rewritten
-                         * into .S or vice versa. Storing it in source_* is
-                         * needed for modpost to compute srcversions.
-                         */
-                        if (first) {
-                                printf("source_%s := %s\n\n", target, s);
-                                printf("deps_%s := \\\n", target);
-                        } else
-                                printf("  %s \\\n", s);
-                        do_config_file(s);
-                }
-                first = 0;
+                /*
+                 * Start searching for next token immediately after the first
+                 * "whitespace" character that follows this token.
+                 */
                 m = p + 1;
         }
+
+        if (!saw_any_target) {
+                fprintf(stderr, "fixdep: parse error; no targets found\n");
+                exit(1);
+        }
+
         printf("\n%s: $(deps_%s)\n\n", target, target);
         printf("$(deps_%s):\n", target);
 }
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b28cc384a5bc..b954de58304f 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -281,6 +281,7 @@ our $signature_tags = qr{(?xi:
         Tested-by:|
         Reviewed-by:|
         Reported-by:|
+        Suggested-by:|
         To:|
         Cc:
 )};
@@ -628,6 +629,13 @@ sub sanitise_line {
         return $res;
 }
 
+sub get_quoted_string {
+        my ($line, $rawline) = @_;
+
+        return "" if ($line !~ m/(\"[X]+\")/g);
+        return substr($rawline, $-[0], $+[0] - $-[0]);
+}
+
 sub ctx_statement_block {
         my ($linenr, $remain, $off) = @_;
         my $line = $linenr - 1;
@@ -1576,7 +1584,8 @@ sub process {
 # Check for incorrect file permissions
                 if ($line =~ /^new (file )?mode.*[7531]\d{0,2}$/) {
                         my $permhere = $here . "FILE: $realfile\n";
-                        if ($realfile =~ /(Makefile|Kconfig|\.c|\.h|\.S|\.tmpl)$/) {
+                        if ($realfile !~ m@scripts/@ &&
+                            $realfile !~ /\.(py|pl|awk|sh)$/) {
                                 ERROR("EXECUTE_PERMISSIONS",
                                       "do not set execute permissions for source files\n" . $permhere);
                         }
@@ -2514,8 +2523,8 @@ sub process {
 
 # check for whitespace before a non-naked semicolon
                 if ($line =~ /^\+.*\S\s+;/) {
-                        CHK("SPACING",
-                            "space prohibited before semicolon\n" . $herecurr);
+                        WARN("SPACING",
+                             "space prohibited before semicolon\n" . $herecurr);
                 }
 
 # Check operator spacing.
@@ -3016,6 +3025,7 @@ sub process {
                             $dstat !~ /^'X'$/ &&                                        # character constants
                             $dstat !~ /$exceptions/ &&
                             $dstat !~ /^\.$Ident\s*=/ &&                                # .foo =
+                            $dstat !~ /^(?:\#\s*$Ident|\#\s*$Constant)\s*$/ &&          # stringification #foo
                             $dstat !~ /^do\s*$Constant\s*while\s*$Constant;?$/ &&       # do {...} while (...); // do {...} while (...)
                             $dstat !~ /^for\s*$Constant$/ &&                            # for (...)
                             $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&   # for (...) bar()
@@ -3220,7 +3230,7 @@ sub process {
                 }
 
 # check for unnecessary blank lines around braces
-                if (($line =~ /^..*}\s*$/ && $prevline =~ /^.\s*$/)) {
+                if (($line =~ /^.\s*}\s*$/ && $prevline =~ /^.\s*$/)) {
                         CHK("BRACES",
                             "Blank lines aren't necessary before a close brace '}'\n" . $hereprev);
                 }
@@ -3372,6 +3382,15 @@ sub process {
                              "struct spinlock should be spinlock_t\n" . $herecurr);
                 }
 
+# check for seq_printf uses that could be seq_puts
+                if ($line =~ /\bseq_printf\s*\(/) {
+                        my $fmt = get_quoted_string($line, $rawline);
+                        if ($fmt !~ /[^\\]\%/) {
+                                WARN("PREFER_SEQ_PUTS",
+                                     "Prefer seq_puts to seq_printf\n" . $herecurr);
+                        }
+                }
+
 # Check for misused memsets
                 if ($^V && $^V ge 5.10.0 &&
                     defined $stat &&
@@ -3476,6 +3495,13 @@ sub process {
                              "unnecessary cast may hide bugs, see http://c-faq.com/malloc/mallocnocast.html\n" . $herecurr);
                 }
 
+# check for krealloc arg reuse
+                if ($^V && $^V ge 5.10.0 &&
+                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*\1\s*,/) {
+                        WARN("KREALLOC_ARG_REUSE",
+                             "Reusing the krealloc arg is almost always a bug\n" . $herecurr);
+                }
+
 # check for alloc argument mismatch
                 if ($line =~ /\b(kcalloc|kmalloc_array)\s*\(\s*sizeof\b/) {
                         WARN("ALLOC_ARRAY_ARGS",
diff --git a/scripts/decodecode b/scripts/decodecode
index 4f8248d5a11f..d8824f37acce 100755
--- a/scripts/decodecode
+++ b/scripts/decodecode
@@ -89,10 +89,16 @@ echo $code >> $T.s
 disas $T
 cat $T.dis >> $T.aa
 
+# (lines of whole $T.oo) - (lines of $T.aa, i.e. "Code starting") + 3,
+# i.e. the title + the "===..=" line (sed is counting from 1, 0 address is
+# special)
+faultlinenum=$(( $(wc -l $T.oo  | cut -d" " -f1) - \
+                 $(wc -l $T.aa  | cut -d" " -f1) + 3))
+
 faultline=`cat $T.dis | head -1 | cut -d":" -f2-`
 faultline=`echo "$faultline" | sed -e 's/\[/\\\[/g; s/\]/\\\]/g'`
 
-cat $T.oo | sed -e "s/\($faultline\)/\*\1     <-- trapping instruction/g"
+cat $T.oo | sed -e "${faultlinenum}s/^\(.*:\)\(.*\)/\1\*\2\t\t<-- trapping instruction/"
 echo
 cat $T.aa
 cleanup
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index d25e4a118d37..88632df4381b 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -45,7 +45,6 @@ int in_source_file;
 
 static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types,
            flag_preserve, flag_warnings;
-static const char *arch = "";
 static const char *mod_prefix = "";
 
 static int errors;
@@ -731,7 +730,7 @@ static void genksyms_usage(void)
 {
         fputs("Usage:\n" "genksyms [-adDTwqhV] > /path/to/.tmp_obj.ver\n" "\n"
 #ifdef __GNU_LIBRARY__
-              "  -a, --arch            Select architecture\n"
+              "  -s, --symbol-prefix   Select symbol prefix\n"
               "  -d, --debug           Increment the debug level (repeatable)\n"
               "  -D, --dump            Dump expanded symbol defs (for debugging only)\n"
               "  -r, --reference file  Read reference symbols from a file\n"
@@ -742,7 +741,7 @@ static void genksyms_usage(void)
               "  -h, --help            Print this message\n"
               "  -V, --version         Print the release version\n"
 #else                           /* __GNU_LIBRARY__ */
-              "  -a                    Select architecture\n"
+              "  -s                    Select symbol prefix\n"
               "  -d                    Increment the debug level (repeatable)\n"
               "  -D                    Dump expanded symbol defs (for debugging only)\n"
               "  -r file               Read reference symbols from a file\n"
@@ -763,7 +762,7 @@ int main(int argc, char **argv)
 
 #ifdef __GNU_LIBRARY__
         struct option long_opts[] = {
-                {"arch", 1, 0, 'a'},
+                {"symbol-prefix", 1, 0, 's'},
                 {"debug", 0, 0, 'd'},
                 {"warnings", 0, 0, 'w'},
                 {"quiet", 0, 0, 'q'},
@@ -776,14 +775,14 @@ int main(int argc, char **argv)
                 {0, 0, 0, 0}
         };
 
-        while ((o = getopt_long(argc, argv, "a:dwqVDr:T:ph",
+        while ((o = getopt_long(argc, argv, "s:dwqVDr:T:ph",
                                 &long_opts[0], NULL)) != EOF)
 #else                           /* __GNU_LIBRARY__ */
-        while ((o = getopt(argc, argv, "a:dwqVDr:T:ph")) != EOF)
+        while ((o = getopt(argc, argv, "s:dwqVDr:T:ph")) != EOF)
 #endif                          /* __GNU_LIBRARY__ */
                 switch (o) {
-                case 'a':
-                        arch = optarg;
+                case 's':
+                        mod_prefix = optarg;
                         break;
                 case 'd':
                         flag_debug++;
@@ -826,9 +825,6 @@ int main(int argc, char **argv)
                         genksyms_usage();
                         return 1;
                 }
-        if ((strcmp(arch, "h8300") == 0) || (strcmp(arch, "blackfin") == 0) ||
-            (strcmp(arch, "metag") == 0))
-                mod_prefix = "_";
         {
                 extern int yydebug;
                 extern int yy_flex_debug;
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index ce4cc837b748..5e4fb144a04f 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -611,7 +611,7 @@ sub get_maintainers {
                                     $hash{$tvi} = $value_pd;
                                 }
                             }
-                        } elsif ($type eq 'K') {
+                        } elsif ($type eq 'N') {
                             if ($file =~ m/$value/x) {
                                 $hash{$tvi} = 0;
                             }
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index f3bffa309333..b5c7d90df9df 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -515,13 +515,6 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
         struct jump_key *jump;
 
         str_printf(r, _("Prompt: %s\n"), _(prop->text));
-        str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
-                prop->menu->lineno);
-        if (!expr_is_yes(prop->visible.expr)) {
-                str_append(r, _("  Depends on: "));
-                expr_gstr_print(prop->visible.expr, r);
-                str_append(r, "\n");
-        }
         menu = prop->menu->parent;
         for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) {
                 bool accessible = menu_is_visible(menu);
@@ -572,6 +565,18 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
 }
 
 /*
+ * get peoperty of type P_SYMBOL
+ */
+static struct property *get_symbol_prop(struct symbol *sym)
+{
+        struct property *prop = NULL;
+
+        for_all_properties(sym, prop, P_SYMBOL)
+                break;
+        return prop;
+}
+
+/*
  * head is optional and may be NULL
  */
 void get_symbol_str(struct gstr *r, struct symbol *sym,
@@ -595,6 +600,18 @@ void get_symbol_str(struct gstr *r, struct symbol *sym,
         }
         for_all_prompts(sym, prop)
                 get_prompt_str(r, prop, head);
+
+        prop = get_symbol_prop(sym);
+        if (prop) {
+                str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
+                        prop->menu->lineno);
+                if (!expr_is_yes(prop->visible.expr)) {
+                        str_append(r, _("  Depends on: "));
+                        expr_gstr_print(prop->visible.expr, r);
+                        str_append(r, "\n");
+                }
+        }
+
         hit = false;
         for_all_properties(sym, prop, P_SELECT) {
                 if (!hit) {
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index 33689396953a..4606cdfb859d 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -156,7 +156,6 @@ sub read_kconfig {
 
     my $state = "NONE";
     my $config;
-    my @kconfigs;
 
     my $cont = 0;
     my $line;
@@ -190,7 +189,13 @@ sub read_kconfig {
 
         # collect any Kconfig sources
         if (/^source\s*"(.*)"/) {
-            $kconfigs[$#kconfigs+1] = $1;
+            my $kconfig = $1;
+            # prevent reading twice.
+            if (!defined($read_kconfigs{$kconfig})) {
+                $read_kconfigs{$kconfig} = 1;
+                read_kconfig($kconfig);
+            }
+            next;
         }
 
         # configs found
@@ -250,14 +255,6 @@ sub read_kconfig {
         }
     }
     close($kinfile);
-
-    # read in any configs that were found.
-    foreach my $kconfig (@kconfigs) {
-        if (!defined($read_kconfigs{$kconfig})) {
-            $read_kconfigs{$kconfig} = 1;
-            read_kconfig($kconfig);
-        }
-    }
 }
 
 if ($kconfig) {
@@ -396,6 +393,15 @@ foreach my $module (keys(%modules)) {
         foreach my $conf (@arr) {
             $configs{$conf} = $module;
             dprint "$conf added by direct ($module)\n";
+            if ($debugprint) {
+                my $c=$conf;
+                $c =~ s/^CONFIG_//;
+                if (defined($depends{$c})) {
+                    dprint " deps = $depends{$c}\n";
+                } else {
+                    dprint " no deps\n";
+                }
+            }
         }
     } else {
         # Most likely, someone has a custom (binary?) module loaded.
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 3d569d6022c2..014994936b1c 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -74,9 +74,8 @@ kallsyms()
         info KSYM ${2}
         local kallsymopt;
 
-        if [ -n "${CONFIG_SYMBOL_PREFIX}" ]; then
-                kallsymopt="${kallsymopt} \
-                            --symbol-prefix=${CONFIG_SYMBOL_PREFIX}"
+        if [ -n "${CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX}" ]; then
+                kallsymopt="${kallsymopt} --symbol-prefix=_"
         fi
 
         if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index b45260bfeaa0..e66d4d258e1a 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -174,5 +174,8 @@ int main(void)
         DEVID_FIELD(x86_cpu_id, model);
         DEVID_FIELD(x86_cpu_id, vendor);
 
+        DEVID(mei_cl_device_id);
+        DEVID_FIELD(mei_cl_device_id, name);
+
         return 0;
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 771ac17f635d..45f9a3377dcd 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1133,6 +1133,18 @@ static int do_x86cpu_entry(const char *filename, void *symval,
 }
 ADD_TO_DEVTABLE("x86cpu", x86_cpu_id, do_x86cpu_entry);
 
+/* Looks like: mei:S */
+static int do_mei_entry(const char *filename, void *symval,
+                        char *alias)
+{
+        DEF_FIELD_ADDR(symval, mei_cl_device_id, name);
+
+        sprintf(alias, MEI_CL_MODULE_PREFIX "%s", *name);
+
+        return 1;
+}
+ADD_TO_DEVTABLE("mei", mei_cl_device_id, do_mei_entry);
+
 /* Does namelen bytes of name exactly match the symbol? */
 static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 {
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 78b30c1548e9..a4be8e112bb6 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -15,17 +15,12 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <limits.h>
+#include <stdbool.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
-
+#include "../../include/linux/export.h"
 
 /* Are we using CONFIG_MODVERSIONS? */
 int modversions = 0;
@@ -85,6 +80,14 @@ PRINTF void merror(const char *fmt, ...)
         va_end(arglist);
 }
 
+static inline bool strends(const char *str, const char *postfix)
+{
+        if (strlen(str) < strlen(postfix))
+                return false;
+
+        return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;
+}
+
 static int is_vmlinux(const char *modname)
 {
         const char *myname;
@@ -120,22 +123,20 @@ static struct module *find_module(char *modname)
         return mod;
 }
 
-static struct module *new_module(char *modname)
+static struct module *new_module(const char *modname)
 {
         struct module *mod;
-        char *p, *s;
+        char *p;
 
         mod = NOFAIL(malloc(sizeof(*mod)));
         memset(mod, 0, sizeof(*mod));
         p = NOFAIL(strdup(modname));
 
         /* strip trailing .o */
-        s = strrchr(p, '.');
-        if (s != NULL)
-                if (strcmp(s, ".o") == 0) {
-                        *s = '\0';
-                        mod->is_dot_o = 1;
-                }
+        if (strends(p, ".o")) {
+                p[strlen(p) - 2] = '\0';
+                mod->is_dot_o = 1;
+        }
 
         /* add to list */
         mod->name = p;
@@ -562,7 +563,7 @@ static void parse_elf_finish(struct elf_info *info)
 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)
+        if (strcmp(symname, VMLINUX_SYMBOL_STR(__this_module)) == 0)
                 return 1;
         /* ignore global offset table */
         if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0)
@@ -583,8 +584,8 @@ static int ignore_undef_symbol(struct elf_info *info, const char *symname)
         return 0;
 }
 
-#define CRC_PFX     MODULE_SYMBOL_PREFIX "__crc_"
-#define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_"
+#define CRC_PFX     VMLINUX_SYMBOL_STR(__crc_)
+#define KSYMTAB_PFX VMLINUX_SYMBOL_STR(__ksymtab_)
 
 static void handle_modversions(struct module *mod, struct elf_info *info,
                                Elf_Sym *sym, const char *symname)
@@ -637,14 +638,15 @@ 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);
-                }
+#ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
+                if (symname[0] != '_')
+                        break;
+                else
+                        symname++;
+#endif
+                mod->unres = alloc_symbol(symname,
+                                          ELF_ST_BIND(sym->st_info) == STB_WEAK,
+                                          mod->unres);
                 break;
         default:
                 /* All exported symbols */
@@ -652,9 +654,9 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                         sym_add_exported(symname + strlen(KSYMTAB_PFX), mod,
                                         export);
                 }
-                if (strcmp(symname, MODULE_SYMBOL_PREFIX "init_module") == 0)
+                if (strcmp(symname, VMLINUX_SYMBOL_STR(init_module)) == 0)
                         mod->has_init = 1;
-                if (strcmp(symname, MODULE_SYMBOL_PREFIX "cleanup_module") == 0)
+                if (strcmp(symname, VMLINUX_SYMBOL_STR(cleanup_module)) == 0)
                         mod->has_cleanup = 1;
                 break;
         }
@@ -1762,6 +1764,27 @@ static void read_symbols(char *modname)
                 mod->unres = alloc_symbol("module_layout", 0, mod->unres);
 }
 
+static void read_symbols_from_files(const char *filename)
+{
+        FILE *in = stdin;
+        char fname[PATH_MAX];
+
+        if (strcmp(filename, "-") != 0) {
+                in = fopen(filename, "r");
+                if (!in)
+                        fatal("Can't open filenames file %s: %m", filename);
+        }
+
+        while (fgets(fname, PATH_MAX, in) != NULL) {
+                if (strends(fname, "\n"))
+                        fname[strlen(fname)-1] = '\0';
+                read_symbols(fname);
+        }
+
+        if (in != stdin)
+                fclose(in);
+}
+
 #define SZ 500
 
 /* We first write the generated file into memory using the
@@ -1934,7 +1957,8 @@ static int add_versions(struct buffer *b, struct module *mod)
                                 s->name, mod->name);
                         continue;
                 }
-                buf_printf(b, "\t{ %#8x, \"%s\" },\n", s->crc, s->name);
+                buf_printf(b, "\t{ %#8x, __VMLINUX_SYMBOL_STR(%s) },\n",
+                           s->crc, s->name);
         }
 
         buf_printf(b, "};\n");
@@ -2122,13 +2146,13 @@ int main(int argc, char **argv)
         struct module *mod;
         struct buffer buf = { };
         char *kernel_read = NULL, *module_read = NULL;
-        char *dump_write = NULL;
+        char *dump_write = NULL, *files_source = 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:e:msSo:awM:K:")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:msST:o:awM:K:")) != -1) {
                 switch (opt) {
                 case 'i':
                         kernel_read = optarg;
@@ -2160,6 +2184,9 @@ int main(int argc, char **argv)
                 case 'S':
                         sec_mismatch_verbose = 0;
                         break;
+                case 'T':
+                        files_source = optarg;
+                        break;
                 case 'w':
                         warn_unresolved = 1;
                         break;
@@ -2182,6 +2209,9 @@ int main(int argc, char **argv)
         while (optind < argc)
                 read_symbols(argv[optind++]);
 
+        if (files_source)
+                read_symbols_from_files(files_source);
+
         for (mod = modules; mod; mod = mod->next) {
                 if (mod->skip)
                         continue;