4 files changed, 43 insertions, 6 deletions

diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 4241e0dfeeaf..f7b6705fd6a3 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -109,7 +109,7 @@ quiet_cmd_mkdir		  = MKDIR   $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
 quiet_cmd_gen             = GEN     $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
       cmd_gen             = \
 FNAME=$(patsubst $(INSTALL_HDR_PATH)/$(_dst)/%,%,$@)                    \
-STUBDEF=__ASM_STUB_`echo $$FNAME | tr a-z. A-Z_`;                       \
+STUBDEF=__ASM_STUB_`echo $$FNAME | tr a-z.- A-Z__`;                     \
 (echo "/* File autogenerated by 'make headers_install' */" ;            \
 echo "\#ifndef $$STUBDEF" ;                                             \
 echo "\#define $$STUBDEF" ;                                             \
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 0b2fcc417f59..c0ae0a7ddb42 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -917,7 +917,7 @@ void ConfigView::updateListAll(void)
 }
 
 ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
-        : Parent(parent, name), menu(0)
+        : Parent(parent, name), menu(0), sym(0)
 {
         if (name) {
                 configSettings->beginGroup(name);
@@ -953,6 +953,7 @@ void ConfigInfoView::setInfo(struct menu *m)
         if (menu == m)
                 return;
         menu = m;
+        sym = NULL;
         if (!menu)
                 clear();
         else
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index df3b272f7ce6..f50a70f550b3 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1469,6 +1469,7 @@ sub push_parameter($$$) {
         my $param = shift;
         my $type = shift;
         my $file = shift;
+        my $anon = 0;
 
         my $param_name = $param;
         $param_name =~ s/\[.*//;
@@ -1484,9 +1485,20 @@ sub push_parameter($$$) {
             $param="void";
             $parameterdescs{void} = "no arguments";
         }
+        elsif ($type eq "" && ($param eq "struct" or $param eq "union"))
+        # handle unnamed (anonymous) union or struct:
+        {
+                $type = $param;
+                $param = "{unnamed_" . $param. "}";
+                $parameterdescs{$param} = "anonymous\n";
+                $anon = 1;
+        }
+
         # warn if parameter has no description
-        # (but ignore ones starting with # as these are no parameters
-        # but inline preprocessor statements
+        # (but ignore ones starting with # as these are not parameters
+        # but inline preprocessor statements);
+        # also ignore unnamed structs/unions;
+        if (!$anon) {
         if (!defined $parameterdescs{$param_name} && $param_name !~ /^#/) {
 
             $parameterdescs{$param_name} = $undescribed;
@@ -1500,6 +1512,7 @@ sub push_parameter($$$) {
                          " No description found for parameter '$param'\n";
             ++$warnings;
         }
+        }
 
         push @parameterlist, $param;
         $parametertypes{$param} = $type;
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 15ab5d02e80a..2aa47623f5f8 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -582,9 +582,19 @@ static int strrcmp(const char *s, const char *sub)
  *   tosec   = .init.text | .exit.text | .init.data
  *   fromsec = .data
  *   atsym = *driver, *_template, *_sht, *_ops, *_probe, *probe_one
+ *
+ * Pattern 3:
+ *   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
+ *   if init section is freed, its ok to reference those symbols.
+ *   For ex. symbols marking the init section boundaries.
+ *   This pattern is identified by
+ *   refsymname = __init_begin, _sinittext, _einittext
  **/
 static int secref_whitelist(const char *modname, const char *tosec,
-                            const char *fromsec, const char *atsym)
+                            const char *fromsec, const char *atsym,
+                            const char *refsymname)
 {
         int f1 = 1, f2 = 1;
         const char **s;
@@ -595,6 +605,14 @@ static int secref_whitelist(const char *modname, const char *tosec,
                 "_ops",
                 "_probe",
                 "_probe_one",
+                "_console",
+                NULL
+        };
+
+        const char *pat3refsym[] = {
+                "__init_begin",
+                "_sinittext",
+                "_einittext",
                 NULL
         };
 
@@ -628,6 +646,11 @@ static int secref_whitelist(const char *modname, const char *tosec,
                 if ((strcmp(fromsec, ".pci_fixup") == 0) &&
                     (strcmp(tosec, ".init.text") == 0))
                 return 1;
+
+                /* Check for pattern 3 */
+                for (s = pat3refsym; *s; s++)
+                        if (strcmp(refsymname, *s) == 0)
+                                return 1;
         }
         return 0;
 }
@@ -737,7 +760,7 @@ static void warn_sec_mismatch(const char *modname, const char *fromsec,
         /* check whitelist - we may ignore it */
         if (before &&
             secref_whitelist(modname, secname, fromsec,
-                             elf->strtab + before->st_name))
+                             elf->strtab + before->st_name, refsymname))
                 return;
 
         if (before && after) {