1 files changed, 1 insertions, 16 deletions

diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index c8e4bb714944..a964c9f40f87 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -581,7 +581,6 @@ do_cache_op(unsigned long start, unsigned long end, int flags)
 #define NR(x) ((__ARM_NR_##x) - __ARM_NR_BASE)
 asmlinkage int arm_syscall(int no, struct pt_regs *regs)
 {
-        struct thread_info *thread = current_thread_info();
         siginfo_t info;
 
         if ((no >> 16) != (__ARM_NR_BASE>> 16))
@@ -632,21 +631,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
                 return regs->ARM_r0;
 
         case NR(set_tls):
-                thread->tp_value[0] = regs->ARM_r0;
-                if (tls_emu)
-                        return 0;
-                if (has_tls_reg) {
-                        asm ("mcr p15, 0, %0, c13, c0, 3"
-                                : : "r" (regs->ARM_r0));
-                } else {
-                        /*
-                         * User space must never try to access this directly.
-                         * Expect your app to break eventually if you do so.
-                         * The user helper at 0xffff0fe0 must be used instead.
-                         * (see entry-armv.S for details)
-                         */
-                        *((unsigned int *)0xffff0ff0) = regs->ARM_r0;
-                }
+                set_tls(regs->ARM_r0);
                 return 0;
 
 #ifdef CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG