diff options
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 5859f598c951..f7864ac2ecc1 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -359,10 +359,8 @@ void __set_special_pids(struct pid *pid) | |||
| 359 | { | 359 | { |
| 360 | struct task_struct *curr = current->group_leader; | 360 | struct task_struct *curr = current->group_leader; |
| 361 | 361 | ||
| 362 | if (task_session(curr) != pid) { | 362 | if (task_session(curr) != pid) |
| 363 | change_pid(curr, PIDTYPE_SID, pid); | 363 | change_pid(curr, PIDTYPE_SID, pid); |
| 364 | proc_sid_connector(curr); | ||
| 365 | } | ||
| 366 | 364 | ||
| 367 | if (task_pgrp(curr) != pid) | 365 | if (task_pgrp(curr) != pid) |
| 368 | change_pid(curr, PIDTYPE_PGID, pid); | 366 | change_pid(curr, PIDTYPE_PGID, pid); |
| @@ -991,8 +989,6 @@ NORET_TYPE void do_exit(long code) | |||
| 991 | tsk->mempolicy = NULL; | 989 | tsk->mempolicy = NULL; |
| 992 | #endif | 990 | #endif |
| 993 | #ifdef CONFIG_FUTEX | 991 | #ifdef CONFIG_FUTEX |
| 994 | if (unlikely(!list_empty(&tsk->pi_state_list))) | ||
| 995 | exit_pi_state_list(tsk); | ||
| 996 | if (unlikely(current->pi_state_cache)) | 992 | if (unlikely(current->pi_state_cache)) |
| 997 | kfree(current->pi_state_cache); | 993 | kfree(current->pi_state_cache); |
| 998 | #endif | 994 | #endif |
