---

yaml --- r: 340315 b: refs/heads/master c: 53b50f9 h: refs/heads/master i: 340313: c09ed40 340311: 8bfdb4b v: v3
git-mirror · Oct 22, 2012 · 9c01d99 · 9c01d99
1 parent b5674fb
commit 9c01d99
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40792104b2550ee067f63c3ccc8ea04747dc5037
+refs/heads/master: 53b50f9483cce47d1a7aefd1c9f442c094a5b1f7
diff --git a/trunk/arch/powerpc/kernel/entry_64.S b/trunk/arch/powerpc/kernel/entry_64.S
@@ -373,6 +373,7 @@ _GLOBAL(ret_from_fork)
 _GLOBAL(ret_from_kernel_thread)
 	bl	.schedule_tail
 	REST_NVGPRS(r1)
+	ld	r14, 0(r14)
 	mtlr	r14
 	mr	r3,r15
 	blrl

diff --git a/trunk/arch/powerpc/kernel/process.c b/trunk/arch/powerpc/kernel/process.c
@@ -749,12 +749,10 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 		struct thread_info *ti = (void *)task_stack_page(p);
 		memset(childregs, 0, sizeof(struct pt_regs));
 		childregs->gpr[1] = sp + sizeof(struct pt_regs);
+		childregs->gpr[14] = usp;	/* function */
 #ifdef CONFIG_PPC64
-		childregs->gpr[14] = *(unsigned long *)usp;
 		clear_tsk_thread_flag(p, TIF_32BIT);
 		childregs->softe = 1;
-#else
-		childregs->gpr[14] = usp;	/* function */
 #endif
 		childregs->gpr[15] = arg;
 		p->thread.regs = NULL;	/* no user register state */