diff --git a/[refs] b/[refs] index 6ab5ad99dd97..9d3a21f670e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 759979ab17512a061c3a3e870f091af27ccdcbfb +refs/heads/master: 7ed0175a462c4c30f6df6fac1cccac058f997739 diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index 1bf3c39d6109..80789a59b4db 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -1499,7 +1499,7 @@ void do_notify_parent(struct task_struct *tsk, int sig) psig = tsk->parent->sighand; spin_lock_irqsave(&psig->siglock, flags); - if (sig == SIGCHLD && + if (!tsk->ptrace && sig == SIGCHLD && (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN || (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) { /*