Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv11352/arch/vax/kernel
Modified Files:
process.c
Log Message:
do_fork() returns the PID or error code in 2.5.70
Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/process.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- process.c 23 Aug 2003 00:20:47 -0000 1.18
+++ process.c 28 Aug 2003 22:48:22 -0000 1.19
@@ -210,7 +210,6 @@
int sys_clone(unsigned long clone_flags, unsigned long newsp, struct pt_regs *regs)
{
int retval;
- struct task_struct *p;
if (!newsp) {
newsp = regs->sp;
@@ -219,27 +218,22 @@
printk("sys_clone: calling do_fork(0x%08lx, 0x%08lx, 0x%p)\n",
clone_flags, newsp, regs);
#endif
- p = do_fork(clone_flags & ~CLONE_IDLETASK, newsp, regs, 0, NULL, NULL);
- retval = IS_ERR(p) ? PTR_ERR(p) : p->pid;
+ retval = do_fork(clone_flags & ~CLONE_IDLETASK, newsp, regs, 0, NULL, NULL);
#ifdef VAX_PROCESS_DEBUG
- printk("sys_clone: do_fork() returned %p, pid %d\n", p, retval);
+ printk("sys_clone: do_fork() returned pid %d\n", retval);
#endif
return retval;
}
int sys_fork(struct pt_regs *regs)
{
- struct task_struct *p;
- p = do_fork(SIGCHLD, regs->sp, regs, 0, NULL, NULL);
- return IS_ERR(p) ? PTR_ERR(p) : p->pid;
+ return do_fork(SIGCHLD, regs->sp, regs, 0, NULL, NULL);
}
int sys_vfork(struct pt_regs *regs)
{
- struct task_struct *p;
- p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->sp, regs, 0, NULL, NULL);
- return IS_ERR(p) ? PTR_ERR(p) : p->pid;
+ return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->sp, regs, 0, NULL, NULL);
}
/*
|
