From d762391a6c630e14a2818c71615416e012802d56 Mon Sep 17 00:00:00 2001
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Date: Fri, 24 Feb 2012 14:52:25 +1000
Subject: [PATCH] --- yaml --- r: 308493 b: refs/heads/master c:
 d5c15f17844b8883bc13b61a8ae114f0d3d59cdd h: refs/heads/master i:   308491:
 87170ded0657cf4bd2eecea42ed16a6d8e9580eb v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/microblaze/kernel/process.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a97626aaddae..6cf5672fe9bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d95e1224afa22e7881fc823849342b5602d736e
+refs/heads/master: d5c15f17844b8883bc13b61a8ae114f0d3d59cdd
diff --git a/trunk/arch/microblaze/kernel/process.c b/trunk/arch/microblaze/kernel/process.c
index 883b92789cdf..1944e00f07e1 100644
--- a/trunk/arch/microblaze/kernel/process.c
+++ b/trunk/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;
 }