From 9c01d993c65f7d3516d6ae00465565154b7722ef Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 21 Oct 2012 16:50:34 -0400 Subject: [PATCH] --- yaml --- r: 340315 b: refs/heads/master c: 53b50f9483cce47d1a7aefd1c9f442c094a5b1f7 h: refs/heads/master i: 340313: c09ed403c66790f43c2aff777637a71ab3089b88 340311: 8bfdb4ba016d5b2cc415ce516c5697feaa04f83f v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/entry_64.S | 1 + trunk/arch/powerpc/kernel/process.c | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9127e3d64b2f..46743032df45 100644 --- 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 index 8fdb05146ca0..e9a906c27234 100644 --- 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 index 7fc70f29edb3..8c600c3f6613 100644 --- 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 */