---

yaml --- r: 308493 b: refs/heads/master c: d5c15f1 h: refs/heads/master i: 308491: 87170de v: v3
git-mirror · May 25, 2012 · d762391 · d762391
1 parent a1b4546
commit d762391
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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;
 }