diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:26:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:26:03 -0400 |
| commit | 5006ecc2d5073d4e52f54381fd0fee1575d4ce22 (patch) | |
| tree | bedfff6f96118771b809de30e559cc370f94c7be /kernel/fork.c | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
| parent | 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index d2fa57d480d4..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); |