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>

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)
          */
         if (tsk->exit_signal != SIGCHLD && !task_detached(tsk) &&
             (tsk->parent_exec_id != tsk->real_parent->self_exec_id ||
-             tsk->self_exec_id != tsk->parent_exec_id) &&
-            !capable(CAP_KILL))
+             tsk->self_exec_id != tsk->parent_exec_id))
                 tsk->exit_signal = SIGCHLD;
 
         signal = tracehook_notify_death(tsk, &cookie, group_dead);