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

1 files changed, 10 insertions, 10 deletions

diff --git a/include/asm-mips/stackframe.h b/include/asm-mips/stackframe.h
index ed33366b85b8..fb41a8d76392 100644
--- a/include/asm-mips/stackframe.h
+++ b/include/asm-mips/stackframe.h
@@ -91,14 +91,14 @@
 #else
                 MFC0    k0, CP0_CONTEXT
 #endif
-#if defined(CONFIG_BUILD_ELF64) || (defined(CONFIG_64BIT) && __GNUC__ < 4)
+#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32)
+                lui     k1, %hi(kernelsp)
+#else
                 lui     k1, %highest(kernelsp)
                 daddiu  k1, %higher(kernelsp)
                 dsll    k1, 16
                 daddiu  k1, %hi(kernelsp)
                 dsll    k1, 16
-#else
-                lui     k1, %hi(kernelsp)
 #endif
                 LONG_SRL        k0, PTEBASE_SHIFT
                 LONG_ADDU       k1, k0
@@ -116,14 +116,14 @@
                 .endm
 #else
                 .macro  get_saved_sp    /* Uniprocessor variation */
-#if defined(CONFIG_BUILD_ELF64) || (defined(CONFIG_64BIT) && __GNUC__ < 4)
+#if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32)
+                lui     k1, %hi(kernelsp)
+#else
                 lui     k1, %highest(kernelsp)
                 daddiu  k1, %higher(kernelsp)
                 dsll    k1, k1, 16
                 daddiu  k1, %hi(kernelsp)
                 dsll    k1, k1, 16
-#else
-                lui     k1, %hi(kernelsp)
 #endif
                 LONG_L  k1, %lo(kernelsp)(k1)
                 .endm
@@ -393,11 +393,11 @@
                  * and disable interrupts only for the
                  * current TC, using the TCStatus register.
                  */
-                mfc0    t0,CP0_TCSTATUS
+                mfc0    t0, CP0_TCSTATUS
                 /* Fortunately CU 0 is in the same place in both registers */
                 /* Set TCU0, TMX, TKSU (for later inversion) and IXMT */
                 li      t1, ST0_CU0 | 0x08001c00
-                or      t0,t1
+                or      t0, t1
                 /* Clear TKSU, leave IXMT */
                 xori    t0, 0x00001800
                 mtc0    t0, CP0_TCSTATUS
@@ -429,11 +429,11 @@
                  * current TC, using the TCStatus register.
                  */
                 _ehb
-                mfc0    t0,CP0_TCSTATUS
+                mfc0    t0, CP0_TCSTATUS
                 /* Fortunately CU 0 is in the same place in both registers */
                 /* Set TCU0, TKSU (for later inversion) and IXMT */
                 li      t1, ST0_CU0 | 0x08001c00
-                or      t0,t1
+                or      t0, t1
                 /* Clear TKSU *and* IXMT */
                 xori    t0, 0x00001c00
                 mtc0    t0, CP0_TCSTATUS