diff options
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 3384eb89cb1c..ac8100e3088a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -114,8 +114,6 @@ void __put_task_struct(struct task_struct *tsk) | |||
114 | WARN_ON(atomic_read(&tsk->usage)); | 114 | WARN_ON(atomic_read(&tsk->usage)); |
115 | WARN_ON(tsk == current); | 115 | WARN_ON(tsk == current); |
116 | 116 | ||
117 | if (unlikely(tsk->audit_context)) | ||
118 | audit_free(tsk); | ||
119 | security_task_free(tsk); | 117 | security_task_free(tsk); |
120 | free_uid(tsk->user); | 118 | free_uid(tsk->user); |
121 | put_group_info(tsk->group_info); | 119 | put_group_info(tsk->group_info); |
@@ -124,12 +122,6 @@ void __put_task_struct(struct task_struct *tsk) | |||
124 | free_task(tsk); | 122 | free_task(tsk); |
125 | } | 123 | } |
126 | 124 | ||
127 | void __put_task_struct_cb(struct rcu_head *rhp) | ||
128 | { | ||
129 | struct task_struct *tsk = container_of(rhp, struct task_struct, rcu); | ||
130 | __put_task_struct(tsk); | ||
131 | } | ||
132 | |||
133 | void __init fork_init(unsigned long mempages) | 125 | void __init fork_init(unsigned long mempages) |
134 | { | 126 | { |
135 | #ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR | 127 | #ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR |
@@ -186,6 +178,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) | |||
186 | atomic_set(&tsk->usage,2); | 178 | atomic_set(&tsk->usage,2); |
187 | atomic_set(&tsk->fs_excl, 0); | 179 | atomic_set(&tsk->fs_excl, 0); |
188 | tsk->btrace_seq = 0; | 180 | tsk->btrace_seq = 0; |
181 | tsk->splice_pipe = NULL; | ||
189 | return tsk; | 182 | return tsk; |
190 | } | 183 | } |
191 | 184 | ||
@@ -1210,7 +1203,7 @@ static task_t *copy_process(unsigned long clone_flags, | |||
1210 | attach_pid(p, PIDTYPE_PGID, process_group(p)); | 1203 | attach_pid(p, PIDTYPE_PGID, process_group(p)); |
1211 | attach_pid(p, PIDTYPE_SID, p->signal->session); | 1204 | attach_pid(p, PIDTYPE_SID, p->signal->session); |
1212 | 1205 | ||
1213 | list_add_tail(&p->tasks, &init_task.tasks); | 1206 | list_add_tail_rcu(&p->tasks, &init_task.tasks); |
1214 | __get_cpu_var(process_counts)++; | 1207 | __get_cpu_var(process_counts)++; |
1215 | } | 1208 | } |
1216 | attach_pid(p, PIDTYPE_PID, p->pid); | 1209 | attach_pid(p, PIDTYPE_PID, p->pid); |