From 197d3f06e732a0428701c4f3550b91f9fc1297ab Mon Sep 17 00:00:00 2001 From: Brian Swetland Date: Wed, 28 Jan 2009 20:45:48 -0800 Subject: [PATCH] HACK stay compatible with the emulated TLS register HACK --- arch/arm/kernel/entry-armv.S | 5 +++-- arch/arm/kernel/traps.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index d2903e3bc861..3a71fb16397e 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -741,10 +741,11 @@ 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) +//#elif !defined(CONFIG_TLS_REG_EMUL) +#endif 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 3f361a783f43..c1750dd70ab6 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -505,7 +505,8 @@ 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) +//#elif !defined(CONFIG_TLS_REG_EMUL) +#endif /* * User space must never try to access this directly. * Expect your app to break eventually if you do so. @@ -513,7 +514,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 -- 2.34.1