diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-02 14:33:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-02 14:33:57 -0400 |
| commit | 1fb5fef9b80d9a3b5368e22031627afd1585487b (patch) | |
| tree | 54f07a532b5b2622b8642156bbcaeca637fcdb8f /kernel/fork.c | |
| parent | 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e (diff) | |
| parent | 330ab71619bacc4d4494227a6cfc9b7f5500403d (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); |