diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 | 
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 | 
| commit | 857c68f733eea07f11a061caea43a38fed61adb7 (patch) | |
| tree | 4567a9e91f717b22143ac1ccb0fb5323ac15afd3 /kernel/fork.c | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
| parent | 402a26f0c040077ed6f941eefac5a6971f0d5f40 (diff) | |
Merge branch 'master'
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/kernel/fork.c b/kernel/fork.c index 54b15f8cda53..d2fa57d480d4 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -180,6 +180,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) | |||
| 180 | atomic_set(&tsk->usage,2); | 180 | atomic_set(&tsk->usage,2); | 
| 181 | atomic_set(&tsk->fs_excl, 0); | 181 | atomic_set(&tsk->fs_excl, 0); | 
| 182 | tsk->btrace_seq = 0; | 182 | tsk->btrace_seq = 0; | 
| 183 | tsk->splice_pipe = NULL; | ||
| 183 | return tsk; | 184 | return tsk; | 
| 184 | } | 185 | } | 
| 185 | 186 | ||
| @@ -1204,7 +1205,7 @@ static task_t *copy_process(unsigned long clone_flags, | |||
| 1204 | attach_pid(p, PIDTYPE_PGID, process_group(p)); | 1205 | attach_pid(p, PIDTYPE_PGID, process_group(p)); | 
| 1205 | attach_pid(p, PIDTYPE_SID, p->signal->session); | 1206 | attach_pid(p, PIDTYPE_SID, p->signal->session); | 
| 1206 | 1207 | ||
| 1207 | list_add_tail(&p->tasks, &init_task.tasks); | 1208 | list_add_tail_rcu(&p->tasks, &init_task.tasks); | 
| 1208 | __get_cpu_var(process_counts)++; | 1209 | __get_cpu_var(process_counts)++; | 
| 1209 | } | 1210 | } | 
| 1210 | attach_pid(p, PIDTYPE_PID, p->pid); | 1211 | attach_pid(p, PIDTYPE_PID, p->pid); | 
