Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

5 files changed, 49 insertions, 5 deletions

diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index f7844f6aa487..663158627155 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -12,6 +12,7 @@
 #       sh64 port by Paul Mundt
 #       Random bits by Matt Mackall <mpm@selenic.com>
 #       M68k port by Geert Uytterhoeven and Andreas Schwab
+#       AVR32 port by Haavard Skinnemoen <hskinnemoen@atmel.com>
 #
 #       Usage:
 #       objdump -d vmlinux | stackcheck.pl [arch]
@@ -37,6 +38,10 @@ my (@stack, $re, $x, $xs);
         if ($arch eq 'arm') {
                 #c0008ffc:      e24dd064        sub     sp, sp, #100    ; 0x64
                 $re = qr/.*sub.*sp, sp, #(([0-9]{2}|[3-9])[0-9]{2})/o;
+        } elsif ($arch eq 'avr32') {
+                #8000008a:       20 1d           sub sp,4
+                #80000ca8:       fa cd 05 b0     sub sp,sp,1456
+                $re = qr/^.*sub.*sp.*,([0-9]{1,8})/o;
         } elsif ($arch =~ /^i[3456]86$/) {
                 #c0105234:       81 ec ac 05 00 00       sub    $0x5ac,%esp
                 $re = qr/^.*[as][du][db]    \$(0x$x{1,8}),\%esp$/o;
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index 0dcc01ce45a6..366f8c7f62bf 100755
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -119,5 +119,5 @@ sed -n -e '/^\#define/ { s/[^_]*__NR_\([^[:space:]]*\).*/\
 \#endif/p }' $1
 }
 
-(ignore_list && syscall_list ${srctree}/include/asm-i386/unistd.h) | \
+(ignore_list && syscall_list ${srctree}/include/asm-x86/unistd_32.h) | \
 $* -E -x c - > /dev/null
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 8a09021d8c59..36e3754db53a 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -484,6 +484,36 @@ static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
         return 1;
 }
 
+/* Looks like: sdio:cNvNdN. */
+static int do_sdio_entry(const char *filename,
+                        struct sdio_device_id *id, char *alias)
+{
+        id->class = TO_NATIVE(id->class);
+        id->vendor = TO_NATIVE(id->vendor);
+        id->device = TO_NATIVE(id->device);
+
+        strcpy(alias, "sdio:");
+        ADD(alias, "c", id->class != (__u8)SDIO_ANY_ID, id->class);
+        ADD(alias, "v", id->vendor != (__u16)SDIO_ANY_ID, id->vendor);
+        ADD(alias, "d", id->device != (__u16)SDIO_ANY_ID, id->device);
+        return 1;
+}
+
+/* Looks like: ssb:vNidNrevN. */
+static int do_ssb_entry(const char *filename,
+                        struct ssb_device_id *id, char *alias)
+{
+        id->vendor = TO_NATIVE(id->vendor);
+        id->coreid = TO_NATIVE(id->coreid);
+        id->revision = TO_NATIVE(id->revision);
+
+        strcpy(alias, "ssb:");
+        ADD(alias, "v", id->vendor != SSB_ANY_VENDOR, id->vendor);
+        ADD(alias, "id", id->coreid != SSB_ANY_ID, id->coreid);
+        ADD(alias, "rev", id->revision != SSB_ANY_REV, id->revision);
+        return 1;
+}
+
 /* Ignore any prefix, eg. v850 prepends _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -599,6 +629,14 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct parisc_device_id), "parisc",
                          do_parisc_entry, mod);
+        else if (sym_is(symname, "__mod_sdio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct sdio_device_id), "sdio",
+                         do_sdio_entry, mod);
+        else if (sym_is(symname, "__mod_ssb_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct ssb_device_id), "ssb",
+                         do_ssb_entry, mod);
 }
 
 /* Now add out buffered information to the generated C source */
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 6c145d6e89de..0a4051fbd34e 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -709,6 +709,7 @@ static int secref_whitelist(const char *modname, const char *tosec,
 
         /* Check for pattern 0 */
         if ((strncmp(fromsec, ".text.init.refok", strlen(".text.init.refok")) == 0) ||
+            (strncmp(fromsec, ".exit.text.refok", strlen(".exit.text.refok")) == 0) ||
             (strncmp(fromsec, ".data.init.refok", strlen(".data.init.refok")) == 0))
                 return 1;
 
diff --git a/scripts/namespace.pl b/scripts/namespace.pl
index f34373853ef8..c6e88c652c2f 100755
--- a/scripts/namespace.pl
+++ b/scripts/namespace.pl
@@ -105,7 +105,7 @@ sub linux_objects
         if (/.*\.o$/ &&
                 ! (
                 m:/built-in.o$:
-                || m:arch/i386/kernel/vsyscall-syms.o$:
+                || m:arch/x86/kernel/vsyscall-syms.o$:
                 || m:arch/ia64/ia32/ia32.o$:
                 || m:arch/ia64/kernel/gate-syms.o$:
                 || m:arch/ia64/lib/__divdi3.o$:
@@ -328,9 +328,9 @@ sub list_multiply_defined
                         }
                         # Special case for i386 entry code
                         if ($#{$def{$name}} == 1 && $name =~ /^__kernel_/ &&
-                            $def{$name}[0] eq "arch/i386/kernel/vsyscall-int80.o" &&
-                            $def{$name}[1] eq "arch/i386/kernel/vsyscall-sysenter.o") {
-                                &drop_def("arch/i386/kernel/vsyscall-sysenter.o", $name);
+                            $def{$name}[0] eq "arch/x86/kernel/vsyscall-int80_32.o" &&
+                            $def{$name}[1] eq "arch/x86/kernel/vsyscall-sysenter_32.o") {
+                                &drop_def("arch/x86/kernel/vsyscall-sysenter_32.o", $name);
                                 next;
                         }
                         printf "$name is multiply defined in :-\n";