Merge tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

[karo-tx-linux.git] / arch / microblaze / kernel / process.c

diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c
index 883b92789cdf849330d3b06e29fafef9b3381b39..1944e00f07e1d4185cbf8bbdf894591192ef6abd 100644 (file)
--- a/arch/microblaze/kernel/process.c
+++ b/arch/microblaze/kernel/process.c
@@ -182,8 +182,12 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 #endif
        ti->cpu_context.r15 = (unsigned long)ret_from_fork - 8;
 
+       /*
+        *  r21 is the thread reg, r10 is 6th arg to clone
+        *  which contains TLS area
+        */
        if (clone_flags & CLONE_SETTLS)
-               ;
+               childregs->r21 = childregs->r10;
 
        return 0;
 }