summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-10-11 18:10:35 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-10-15 03:35:52 +0400
commit40792104b2550ee067f63c3ccc8ea04747dc5037 (patch)
tree0741b5e53e5dddd298eb583b8c937d2fc5faa0e5 /arch/powerpc
parent138d1ce80ed96eff6638f454f0a1500a4aefd17b (diff)
downloadlinux-40792104b2550ee067f63c3ccc8ea04747dc5037.tar.xz
powerpc: don't mess with r2 in copy_thread() and friends
kernel_thread() callbacks are *not* in modules and are not going to be there. And it's not even read in ppc32 ret_from_kernel_thread(), so no need to bother with it there either. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/entry_64.S1
-rw-r--r--arch/powerpc/kernel/process.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2eb766ad1c5c..8fdb05146ca0 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -373,7 +373,6 @@ _GLOBAL(ret_from_fork)
_GLOBAL(ret_from_kernel_thread)
bl .schedule_tail
REST_NVGPRS(r1)
- REST_GPR(2,r1)
mtlr r14
mr r3,r15
blrl
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 9e685e26c2d1..7fc70f29edb3 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -751,12 +751,10 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
childregs->gpr[1] = sp + sizeof(struct pt_regs);
#ifdef CONFIG_PPC64
childregs->gpr[14] = *(unsigned long *)usp;
- childregs->gpr[2] = ((unsigned long *)usp)[1],
clear_tsk_thread_flag(p, TIF_32BIT);
childregs->softe = 1;
#else
childregs->gpr[14] = usp; /* function */
- childregs->gpr[2] = (unsigned long) p;
#endif
childregs->gpr[15] = arg;
p->thread.regs = NULL; /* no user register state */