aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-07 06:05:21 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-07 06:05:25 -0400
commit6c009ecef8cca28c7c09eb16d0802e37915a76e1 (patch)
tree11c773f780186fdb9fbc9c80a73fb7c8426b1fba /kernel/exit.c
parent98c2aaf8be5baf7193be37fb28bce8e7327158bc (diff)
parentd508afb437daee7cf07da085b635c44a4ebf9b38 (diff)
Merge branch 'linus' into perfcounters/core
Merge reason: need the upstream facility added by: 7f1e2ca: hrtimer: fix rq->lock inversion (again) Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 7a14a2b504f5..fbb5d94c8bbc 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -840,8 +840,7 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
840 */ 840 */
841 if (tsk->exit_signal != SIGCHLD && !task_detached(tsk) && 841 if (tsk->exit_signal != SIGCHLD && !task_detached(tsk) &&
842 (tsk->parent_exec_id != tsk->real_parent->self_exec_id || 842 (tsk->parent_exec_id != tsk->real_parent->self_exec_id ||
843 tsk->self_exec_id != tsk->parent_exec_id) && 843 tsk->self_exec_id != tsk->parent_exec_id))
844 !capable(CAP_KILL))
845 tsk->exit_signal = SIGCHLD; 844 tsk->exit_signal = SIGCHLD;
846 845
847 signal = tracehook_notify_death(tsk, &cookie, group_dead); 846 signal = tracehook_notify_death(tsk, &cookie, group_dead);