diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-05-19 03:32:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-05-19 03:32:01 -0700 |
| commit | 4165cb26cb50caf4098870f74fe74e7d16bccda5 (patch) | |
| tree | 5a923e4e840bc53e78511958c3d2a04fbae3fc75 | |
| parent | a76e8f99a2e911c78fc11a32ea05215d92b9a1f8 (diff) | |
[SPARC{32,64}]: Adjust for changed do_fork return value.
| -rw-r--r-- | arch/sparc/kernel/process.c | 10 | ||||
| -rw-r--r-- | arch/sparc64/kernel/process.c | 11 |
2 files changed, 8 insertions, 13 deletions
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index 37efbfbdd54a..3608f9408eb8 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c @@ -403,7 +403,6 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags, { unsigned long parent_tid_ptr = 0; unsigned long child_tid_ptr = 0; - struct task_struct *p; clone_flags &= ~CLONE_IDLETASK; @@ -411,11 +410,10 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags, parent_tid_ptr = regs->u_regs[UREG_G2]; child_tid_ptr = regs->u_regs[UREG_G3]; } - p = do_fork(clone_flags, stack_start, - regs, stack_size, - (int *) parent_tid_ptr, - (int *) child_tid_ptr); - return IS_ERR(p) ? PTR_ERR(p) : p->pid; + return do_fork(clone_flags, stack_start, + regs, stack_size, + (int *) parent_tid_ptr, + (int *) child_tid_ptr); } /* Copy a Sparc thread. The fork() return value conventions diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c index 8c0f80c7835a..6326ab3761ea 100644 --- a/arch/sparc64/kernel/process.c +++ b/arch/sparc64/kernel/process.c @@ -568,7 +568,6 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags, struct pt_regs *regs, unsigned long stack_size) { - struct task_struct *p; unsigned long parent_tid_ptr = 0; unsigned long child_tid_ptr = 0; @@ -583,12 +582,10 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags, } } - p = do_fork(clone_flags, stack_start, - regs, stack_size, - (int *) parent_tid_ptr, - (int *) child_tid_ptr); - - return IS_ERR(p) ? PTR_ERR(p) : p->pid; + return do_fork(clone_flags, stack_start, + regs, stack_size, + (int *) parent_tid_ptr, + (int *) child_tid_ptr); } /* Copy a Sparc thread. The fork() return value conventions |