Commit 433553bd authored by Jeff Dike's avatar Jeff Dike

Updated to 2.5.49, which involved fixing the calls to do_fork.

parent f698b940
...@@ -190,7 +190,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) ...@@ -190,7 +190,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
current->thread.request.u.thread.proc = fn; current->thread.request.u.thread.proc = fn;
current->thread.request.u.thread.arg = arg; current->thread.request.u.thread.arg = arg;
p = do_fork(CLONE_VM | flags, 0, NULL, 0, NULL); p = do_fork(CLONE_VM | flags, 0, NULL, 0, NULL, NULL);
if(IS_ERR(p)) panic("do_fork failed in kernel_thread"); if(IS_ERR(p)) panic("do_fork failed in kernel_thread");
return(p->pid); return(p->pid);
} }
......
...@@ -33,7 +33,7 @@ long sys_fork(void) ...@@ -33,7 +33,7 @@ long sys_fork(void)
struct task_struct *p; struct task_struct *p;
current->thread.forking = 1; current->thread.forking = 1;
p = do_fork(SIGCHLD, 0, NULL, 0, NULL); p = do_fork(SIGCHLD, 0, NULL, 0, NULL, NULL);
current->thread.forking = 0; current->thread.forking = 0;
return(IS_ERR(p) ? PTR_ERR(p) : p->pid); return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
} }
...@@ -43,7 +43,7 @@ long sys_clone(unsigned long clone_flags, unsigned long newsp) ...@@ -43,7 +43,7 @@ long sys_clone(unsigned long clone_flags, unsigned long newsp)
struct task_struct *p; struct task_struct *p;
current->thread.forking = 1; current->thread.forking = 1;
p = do_fork(clone_flags, newsp, NULL, 0, NULL); p = do_fork(clone_flags, newsp, NULL, 0, NULL, NULL);
current->thread.forking = 0; current->thread.forking = 0;
return(IS_ERR(p) ? PTR_ERR(p) : p->pid); return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
} }
...@@ -53,7 +53,7 @@ long sys_vfork(void) ...@@ -53,7 +53,7 @@ long sys_vfork(void)
struct task_struct *p; struct task_struct *p;
current->thread.forking = 1; current->thread.forking = 1;
p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, NULL, 0, NULL); p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, NULL, 0, NULL, NULL);
current->thread.forking = 0; current->thread.forking = 0;
return(IS_ERR(p) ? PTR_ERR(p) : p->pid); return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
} }
......
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