commit eda96977024c84e677191cad785351abbb945901
author Al Viro <viro@zeniv.linux.org.uk> Sun Oct 21 16:44:57 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Wed Nov 28 23:43:40 2012 -0500
tree a1038d27bb6b4399d8625da045c4af31d12df4e5
parent 951b39619a76643972f6f23e007fd0f3fbbd71c2

score: switch to generic fork/vfork/clone

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

arch/score/kernel/process.c

diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
index 6f311cf..f96379a 100644
--- a/arch/score/kernel/process.c
+++ b/arch/score/kernel/process.c
@@ -94,17 +94,17 @@
 	struct pt_regs *childregs = task_pt_regs(p);
 
 	p->thread.reg0 = (unsigned long) childregs;
-	if (unlikely(!regs)) {
+	if (unlikely(p->flags & PF_KTHREAD)) {
 		memset(childregs, 0, sizeof(struct pt_regs));
 		p->thread->reg12 = usp;
 		p->thread->reg13 = arg;
 		p->thread.reg3 = (unsigned long) ret_from_kernel_thread;
 	} else {
-		*childregs = *regs;
+		*childregs = *current_pt_regs();
 		childregs->regs[7] = 0;		/* Clear error flag */
 		childregs->regs[4] = 0;		/* Child gets zero as return value */
-		childregs->regs[0] = usp;	/* user fork */
-		regs->regs[4] = p->pid;		/* WTF? */
+		if (usp)
+			childregs->regs[0] = usp;	/* user fork */
 		p->thread.reg3 = (unsigned long) ret_from_fork;
 	}