diff options
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 7bb73f9d09db..a949819055d5 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -312,17 +312,6 @@ kill_orphaned_pgrp(struct task_struct *tsk, struct task_struct *parent) | |||
312 | } | 312 | } |
313 | } | 313 | } |
314 | 314 | ||
315 | void __set_special_pids(struct pid *pid) | ||
316 | { | ||
317 | struct task_struct *curr = current->group_leader; | ||
318 | |||
319 | if (task_session(curr) != pid) | ||
320 | change_pid(curr, PIDTYPE_SID, pid); | ||
321 | |||
322 | if (task_pgrp(curr) != pid) | ||
323 | change_pid(curr, PIDTYPE_PGID, pid); | ||
324 | } | ||
325 | |||
326 | /* | 315 | /* |
327 | * Let kernel threads use this to say that they allow a certain signal. | 316 | * Let kernel threads use this to say that they allow a certain signal. |
328 | * Must not be used if kthread was cloned with CLONE_SIGHAND. | 317 | * Must not be used if kthread was cloned with CLONE_SIGHAND. |
@@ -819,7 +808,7 @@ void do_exit(long code) | |||
819 | /* | 808 | /* |
820 | * FIXME: do that only when needed, using sched_exit tracepoint | 809 | * FIXME: do that only when needed, using sched_exit tracepoint |
821 | */ | 810 | */ |
822 | ptrace_put_breakpoints(tsk); | 811 | flush_ptrace_hw_breakpoint(tsk); |
823 | 812 | ||
824 | exit_notify(tsk, group_dead); | 813 | exit_notify(tsk, group_dead); |
825 | #ifdef CONFIG_NUMA | 814 | #ifdef CONFIG_NUMA |
@@ -835,7 +824,7 @@ void do_exit(long code) | |||
835 | /* | 824 | /* |
836 | * Make sure we are holding no locks: | 825 | * Make sure we are holding no locks: |
837 | */ | 826 | */ |
838 | debug_check_no_locks_held(tsk); | 827 | debug_check_no_locks_held(); |
839 | /* | 828 | /* |
840 | * We can do this unlocked here. The futex code uses this flag | 829 | * We can do this unlocked here. The futex code uses this flag |
841 | * just to verify whether the pi state cleanup has been done | 830 | * just to verify whether the pi state cleanup has been done |