diff options
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 1c1cf8dc396b..fb8572a42297 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
| @@ -1124,8 +1124,6 @@ static task_t *copy_process(unsigned long clone_flags, | |||
| 1124 | if (unlikely(p->ptrace & PT_PTRACED)) | 1124 | if (unlikely(p->ptrace & PT_PTRACED)) |
| 1125 | __ptrace_link(p, current->parent); | 1125 | __ptrace_link(p, current->parent); |
| 1126 | 1126 | ||
| 1127 | cpuset_fork(p); | ||
| 1128 | |||
| 1129 | attach_pid(p, PIDTYPE_PID, p->pid); | 1127 | attach_pid(p, PIDTYPE_PID, p->pid); |
| 1130 | attach_pid(p, PIDTYPE_TGID, p->tgid); | 1128 | attach_pid(p, PIDTYPE_TGID, p->tgid); |
| 1131 | if (thread_group_leader(p)) { | 1129 | if (thread_group_leader(p)) { |
| @@ -1135,13 +1133,14 @@ static task_t *copy_process(unsigned long clone_flags, | |||
| 1135 | __get_cpu_var(process_counts)++; | 1133 | __get_cpu_var(process_counts)++; |
| 1136 | } | 1134 | } |
| 1137 | 1135 | ||
| 1138 | proc_fork_connector(p); | ||
| 1139 | if (!current->signal->tty && p->signal->tty) | 1136 | if (!current->signal->tty && p->signal->tty) |
| 1140 | p->signal->tty = NULL; | 1137 | p->signal->tty = NULL; |
| 1141 | 1138 | ||
| 1142 | nr_threads++; | 1139 | nr_threads++; |
| 1143 | total_forks++; | 1140 | total_forks++; |
| 1144 | write_unlock_irq(&tasklist_lock); | 1141 | write_unlock_irq(&tasklist_lock); |
| 1142 | proc_fork_connector(p); | ||
| 1143 | cpuset_fork(p); | ||
| 1145 | retval = 0; | 1144 | retval = 0; |
| 1146 | 1145 | ||
| 1147 | fork_out: | 1146 | fork_out: |
