revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / arch / tile / kernel / process.c

diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index aaf6282bacc3728f9ad5de56e79ca343b05c32e8..84c29111756c2212f02cd5bc841691c1cc0a0fd9 100644 (file)
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -211,13 +211,6 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
        childregs->regs[0] = 0;         /* return value is zero */
        childregs->sp = sp;  /* override with new user stack pointer */
 
-       /*
-        * If CLONE_SETTLS is set, set "tp" in the new task to "r4",
-        * which is passed in as arg #5 to sys_clone().
-        */
-       if (clone_flags & CLONE_SETTLS)
-               childregs->tp = regs->regs[4];
-
        /*
         * Copy the callee-saved registers from the passed pt_regs struct
         * into the context-switch callee-saved registers area.