Revert "HACK stay compatible with the emulated TLS register HACK"

This reverts commit 197d3f06e732a0428701c4f3550b91f9fc1297ab.

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 3a71fb16397e7b56881ea3e55212f148fe8e782a..d2903e3bc8611b1712fe8befea100f9880451edc 100644 (file)
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -741,11 +741,10 @@ ENTRY(__switch_to)
 #endif
 #if defined(CONFIG_HAS_TLS_REG)
        mcr     p15, 0, r3, c13, c0, 3          @ set TLS register
-//#elif !defined(CONFIG_TLS_REG_EMUL)
-#endif
+#elif !defined(CONFIG_TLS_REG_EMUL)
        mov     r4, #0xffff0fff
        str     r3, [r4, #-15]                  @ TLS val at 0xffff0ff0
-//#endif
+#endif
 #ifdef CONFIG_MMU
        mcr     p15, 0, r6, c3, c0, 0           @ Set domain register
 #endif

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index c1750dd70ab6ca0a1a584d863d79d8e3ee0f46ae..3f361a783f43a6b9bea075e035e5405649b185dd 100644 (file)
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -505,8 +505,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
                thread->tp_value = regs->ARM_r0;
 #if defined(CONFIG_HAS_TLS_REG)
                asm ("mcr p15, 0, %0, c13, c0, 3" : : "r" (regs->ARM_r0) );
-//#elif !defined(CONFIG_TLS_REG_EMUL)
-#endif
+#elif !defined(CONFIG_TLS_REG_EMUL)
                /*
                 * User space must never try to access this directly.
                 * Expect your app to break eventually if you do so.
@@ -514,7 +513,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
                 * (see entry-armv.S for details)
                 */
                *((unsigned int *)0xffff0ff0) = regs->ARM_r0;
-//#endif
+#endif
                return 0;
 
 #ifdef CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG