Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/net/pcmcia/fmvj18x_cs.c
	drivers/net/pcmcia/nmclan_cs.c
	drivers/net/pcmcia/xirc2ps_cs.c
	drivers/net/wireless/ray_cs.c

3 files changed, 7 insertions, 4 deletions

diff --git a/arch/mips/include/asm/bug.h b/arch/mips/include/asm/bug.h
index 6cf29c26e873..540c98a810d1 100644
--- a/arch/mips/include/asm/bug.h
+++ b/arch/mips/include/asm/bug.h
@@ -11,9 +11,7 @@
 static inline void __noreturn BUG(void)
 {
         __asm__ __volatile__("break %0" : : "i" (BRK_BUG));
-        /* Fool GCC into thinking the function doesn't return. */
-        while (1)
-                ;
+        unreachable();
 }
 
 #define HAVE_ARCH_BUG
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 3fe1fcfa2e73..fe0d79805603 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -306,6 +306,7 @@ static inline int mips_atomic_set(struct pt_regs *regs,
 
         if (cpu_has_llsc && R10000_LLSC_WAR) {
                 __asm__ __volatile__ (
+                "       .set    mips3                                   \n"
                 "       li      %[err], 0                               \n"
                 "1:     ll      %[old], (%[addr])                       \n"
                 "       move    %[tmp], %[new]                          \n"
@@ -320,6 +321,7 @@ static inline int mips_atomic_set(struct pt_regs *regs,
                 "       "STR(PTR)"      1b, 4b                          \n"
                 "       "STR(PTR)"      2b, 4b                          \n"
                 "       .previous                                       \n"
+                "       .set    mips0                                   \n"
                 : [old] "=&r" (old),
                   [err] "=&r" (err),
                   [tmp] "=&r" (tmp)
@@ -329,6 +331,7 @@ static inline int mips_atomic_set(struct pt_regs *regs,
                 : "memory");
         } else if (cpu_has_llsc) {
                 __asm__ __volatile__ (
+                "       .set    mips3                                   \n"
                 "       li      %[err], 0                               \n"
                 "1:     ll      %[old], (%[addr])                       \n"
                 "       move    %[tmp], %[new]                          \n"
@@ -347,6 +350,7 @@ static inline int mips_atomic_set(struct pt_regs *regs,
                 "       "STR(PTR)"      1b, 5b                          \n"
                 "       "STR(PTR)"      2b, 5b                          \n"
                 "       .previous                                       \n"
+                "       .set    mips0                                   \n"
                 : [old] "=&r" (old),
                   [err] "=&r" (err),
                   [tmp] "=&r" (tmp)
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 9f40e1ff9b4f..041fc1afc3f4 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -110,7 +110,6 @@ static struct korina_device korina_dev0_data = {
 static struct platform_device korina_dev0 = {
         .id = -1,
         .name = "korina",
-        .dev.driver_data = &korina_dev0_data,
         .resource = korina_dev0_res,
         .num_resources = ARRAY_SIZE(korina_dev0_res),
 };
@@ -332,6 +331,8 @@ static int __init plat_setup_devices(void)
         /* set the uart clock to the current cpu frequency */
         rb532_uart_res[0].uartclk = idt_cpu_freq;
 
+        dev_set_drvdata(&korina_dev0.dev, &korina_dev0_data);
+
         return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs));
 }