Commit 4165cb26 authored by David S. Miller's avatar David S. Miller

[SPARC{32,64}]: Adjust for changed do_fork return value.

parent a76e8f99
...@@ -403,7 +403,6 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags, ...@@ -403,7 +403,6 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags,
{ {
unsigned long parent_tid_ptr = 0; unsigned long parent_tid_ptr = 0;
unsigned long child_tid_ptr = 0; unsigned long child_tid_ptr = 0;
struct task_struct *p;
clone_flags &= ~CLONE_IDLETASK; clone_flags &= ~CLONE_IDLETASK;
...@@ -411,11 +410,10 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags, ...@@ -411,11 +410,10 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags,
parent_tid_ptr = regs->u_regs[UREG_G2]; parent_tid_ptr = regs->u_regs[UREG_G2];
child_tid_ptr = regs->u_regs[UREG_G3]; child_tid_ptr = regs->u_regs[UREG_G3];
} }
p = do_fork(clone_flags, stack_start, return do_fork(clone_flags, stack_start,
regs, stack_size, regs, stack_size,
(int *) parent_tid_ptr, (int *) parent_tid_ptr,
(int *) child_tid_ptr); (int *) child_tid_ptr);
return IS_ERR(p) ? PTR_ERR(p) : p->pid;
} }
/* Copy a Sparc thread. The fork() return value conventions /* Copy a Sparc thread. The fork() return value conventions
......
...@@ -568,7 +568,6 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags, ...@@ -568,7 +568,6 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags,
struct pt_regs *regs, struct pt_regs *regs,
unsigned long stack_size) unsigned long stack_size)
{ {
struct task_struct *p;
unsigned long parent_tid_ptr = 0; unsigned long parent_tid_ptr = 0;
unsigned long child_tid_ptr = 0; unsigned long child_tid_ptr = 0;
...@@ -583,12 +582,10 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags, ...@@ -583,12 +582,10 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags,
} }
} }
p = do_fork(clone_flags, stack_start, return do_fork(clone_flags, stack_start,
regs, stack_size, regs, stack_size,
(int *) parent_tid_ptr, (int *) parent_tid_ptr,
(int *) child_tid_ptr); (int *) child_tid_ptr);
return IS_ERR(p) ? PTR_ERR(p) : p->pid;
} }
/* Copy a Sparc thread. The fork() return value conventions /* Copy a Sparc thread. The fork() return value conventions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment