shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 197d3f06e7.
This commit is contained in:
黄涛
2011-07-30 22:27:03 +08:00
parent fe09b9072b
commit 23a401673b
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/kernel/entry-armv.S
View File

@@ -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

5
arch/arm/kernel/traps.c
View File

@@ -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