6 files changed, 58 insertions, 74 deletions

diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index f7b6705fd6a3..8cd63014a0d1 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -144,7 +144,7 @@ $(check-y) : $(INSTALL_HDR_PATH)/$(_dst)/.check.%.h : $(INSTALL_HDR_PATH)/$(_dst
         $(call cmd,check)
 
 # Other dependencies for $(check-y)
--include /dev/null $(check-y)
+include /dev/null $(wildcard $(check-y))
 
 # ... but leave $(check-y) as .PHONY for now until those deps are actually correct.
 .PHONY: $(check-y)
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index 120d624e672c..cdca7388e0f1 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -4,21 +4,15 @@
 # What library to link
 ldflags()
 {
-        $cc -print-file-name=libncursesw.so | grep -q /
-        if [ $? -eq 0 ]; then
-                echo '-lncursesw'
-                exit
-        fi
-        $cc -print-file-name=libncurses.so | grep -q /
-        if [ $? -eq 0 ]; then
-                echo '-lncurses'
-                exit
-        fi
-        $cc -print-file-name=libcurses.so | grep -q /
-        if [ $? -eq 0 ]; then
-                echo '-lcurses'
-                exit
-        fi
+        for ext in so a dylib ; do
+                for lib in ncursesw ncurses curses ; do
+                        $cc -print-file-name=lib${lib}.${ext} | grep -q /
+                        if [ $? -eq 0 ]; then
+                                echo "-l${lib}"
+                                exit
+                        fi
+                done
+        done
         exit 1
 }
 
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index ed1244dd58d0..f646381dc015 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -353,11 +353,16 @@ static int do_pcmcia_entry(const char *filename,
 
 static int do_of_entry (const char *filename, struct of_device_id *of, char *alias)
 {
+    int len;
     char *tmp;
-    sprintf (alias, "of:N%sT%sC%s",
+    len = sprintf (alias, "of:N%sT%s",
                     of->name[0] ? of->name : "*",
-                    of->type[0] ? of->type : "*",
-                    of->compatible[0] ? of->compatible : "*");
+                    of->type[0] ? of->type : "*");
+
+    if (of->compatible[0])
+        sprintf (&alias[len], "%sC%s",
+                     of->type[0] ? "*" : "",
+                     of->compatible);
 
     /* Replace all whitespace with underscores */
     for (tmp = alias; tmp && *tmp; tmp++)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 113dc77b9f60..8e5610d428c5 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -582,6 +582,12 @@ static int strrcmp(const char *s, const char *sub)
 
 /**
  * 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.
@@ -619,14 +625,6 @@ 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
- *
  * Pattern 7:
  *  Logos used in drivers/video/logo reside in __initdata but the
  *  funtion that references them are EXPORT_SYMBOL() so cannot be
@@ -642,16 +640,11 @@ static int strrcmp(const char *s, const char *sub)
  *  tosec   = .init.text
  *  fromsec  = .paravirtprobe
  *
- * Pattern 9:
- *  Some of functions are common code between boot time and hotplug
- *  time. The bootmem allocater is called only boot time in its
- *  functions. So it's ok to reference.
- *  tosec    = .init.text
- *
  * Pattern 10:
- *  ia64 has machvec table for each platform. It is mixture of function
- *  pointer of .init.text and .text.
- *  fromsec  = .machvec
+ *  ia64 has machvec table for each platform and
+ *  powerpc has a machine desc table for each platform.
+ *  It is mixture of function pointers of .init.text and .text.
+ *  fromsec  = .machvec | .machine.desc
  **/
 static int secref_whitelist(const char *modname, const char *tosec,
                             const char *fromsec, const char *atsym,
@@ -678,11 +671,10 @@ static int secref_whitelist(const char *modname, const char *tosec,
                 NULL
         };
 
-        const char *pat4sym[] = {
-                "sparse_index_alloc",
-                "zone_wait_table_init",
-                NULL
-        };
+        /* Check for pattern 0 */
+        if ((strcmp(fromsec, ".text.init.refok") == 0) ||
+            (strcmp(fromsec, ".data.init.refok") == 0))
+                return 1;
 
         /* Check for pattern 1 */
         if (strcmp(tosec, ".init.data") != 0)
@@ -725,12 +717,6 @@ static int secref_whitelist(const char *modname, const char *tosec,
                 if (strcmp(refsymname, *s) == 0)
                         return 1;
 
-        /* Check for pattern 6 */
-        if ((strcmp(tosec, ".init.text") == 0) &&
-            (strcmp(fromsec, ".text") == 0) &&
-            (strcmp(refsymname, "kernel_init") == 0))
-                return 1;
-
         /* Check for pattern 7 */
         if ((strcmp(tosec, ".init.data") == 0) &&
             (strncmp(fromsec, ".text", strlen(".text")) == 0) &&
@@ -742,15 +728,9 @@ static int secref_whitelist(const char *modname, const char *tosec,
             (strcmp(fromsec, ".paravirtprobe") == 0))
                 return 1;
 
-        /* Check for pattern 9 */
-        if ((strcmp(tosec, ".init.text") == 0) &&
-            (strcmp(fromsec, ".text") == 0))
-                for (s = pat4sym; *s; s++)
-                        if (strcmp(atsym, *s) == 0)
-                                return 1;
-
         /* Check for pattern 10 */
-        if (strcmp(fromsec, ".machvec") == 0)
+        if ((strcmp(fromsec, ".machvec") == 0) ||
+            (strcmp(fromsec, ".machine.desc") == 0))
                 return 1;
 
         return 0;
@@ -884,30 +864,34 @@ static void warn_sec_mismatch(const char *modname, const char *fromsec,
                              elf->strtab + before->st_name, refsymname))
                 return;
 
+        /* fromsec whitelist - without a valid 'before'
+         * powerpc has a GOT table in .got2 section */
+        if (strcmp(fromsec, ".got2") == 0)
+                return;
+
         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,
+                warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s "
+                     "(between '%s' and '%s')\n",
+                     modname, fromsec, (unsigned long long)r.r_offset,
+                     secname, refsymname,
                      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);
+                warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s "
+                     "(after '%s')\n",
+                     modname, fromsec, (unsigned long long)r.r_offset,
+                     secname, refsymname,
+                     elf->strtab + before->st_name);
         } else if (after) {
-                warn("%s - Section mismatch: reference to %s:%s from %s "
+                warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s "
                      "before '%s' (at offset -0x%llx)\n",
-                     modname, secname, refsymname, fromsec,
-                     elf->strtab + after->st_name,
-                     (long long)r.r_offset);
+                     modname, fromsec, (unsigned long long)r.r_offset,
+                     secname, refsymname,
+                     elf->strtab + after->st_name);
         } else {
-                warn("%s - Section mismatch: reference to %s:%s from %s "
-                     "(offset 0x%llx)\n",
-                     modname, secname, fromsec, refsymname,
-                     (long long)r.r_offset);
+                warn("%s(%s+0x%llx): Section mismatch: reference to %s:%s\n",
+                     modname, fromsec, (unsigned long long)r.r_offset,
+                     secname, refsymname);
         }
 }
 
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 6873d5af80d5..d9cc6901d680 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -7,6 +7,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
+#include <limits.h>
 #include "modpost.h"
 
 /*
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 88b5281ac41e..aa0ccdbd1f47 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -69,8 +69,8 @@ cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
 # Install arch-specific kernel image(s)
 #
 case "${ARCH}" in
-        i386)
-                [ -f "${objtree}/arch/i386/boot/bzImage" ] && cp -v -- "${objtree}/arch/i386/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+        i386|x86_64)
+                [ -f "${objtree}/arch/$ARCH/boot/bzImage" ] && cp -v -- "${objtree}/arch/$ARCH/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
                 ;;
         alpha)
                 [ -f "${objtree}/arch/alpha/boot/vmlinux.gz" ] && cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"