[PATCH] m68k do_fork()

M68k: Update for changed do_fork() semantics in 2.5.70

diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index e26477d342d5e77aa8f1827dbc37a7a482da4f17..0fdc63c71dd7024165d97a5af0d41e97d892252c 100644 (file)
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -202,24 +202,19 @@ void flush_thread(void)
 
 asmlinkage int m68k_fork(struct pt_regs *regs)
 {
-       struct task_struct *p;
-       p = do_fork(SIGCHLD, rdusp(), regs, 0, NULL, NULL);
-       return IS_ERR(p) ? PTR_ERR(p) : p->pid;
+       return do_fork(SIGCHLD, rdusp(), regs, 0, NULL, NULL);
 }
 
 asmlinkage int m68k_vfork(struct pt_regs *regs)
 {
-       struct task_struct *p;
-       p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, rdusp(), regs, 0, NULL,
-                   NULL);
-       return IS_ERR(p) ? PTR_ERR(p) : p->pid;
+       return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, rdusp(), regs, 0,
+                      NULL, NULL);
 }
 
 asmlinkage int m68k_clone(struct pt_regs *regs)
 {
        unsigned long clone_flags;
        unsigned long newsp;
-       struct task_struct *p;
        int *parent_tidptr, *child_tidptr;
 
        /* syscall2 puts clone_flags in d1 and usp in d2 */
@@ -229,9 +224,8 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
        child_tidptr = (int *)regs->d4;
        if (!newsp)
                newsp = rdusp();
-       p = do_fork(clone_flags & ~CLONE_IDLETASK, newsp, regs, 0,
-                   parent_tidptr, child_tidptr);
-       return IS_ERR(p) ? PTR_ERR(p) : p->pid;
+       return do_fork(clone_flags & ~CLONE_IDLETASK, newsp, regs, 0,
+                      parent_tidptr, child_tidptr);
 }
 
 int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,