From 25f453322bcd2be5da45c5ba3fccf952d906c258 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Thu, 10 Nov 2005 17:22:18 +0300
Subject: [PATCH] --- yaml --- r: 13752 b: refs/heads/master c:
 7ed0175a462c4c30f6df6fac1cccac058f997739 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/signal.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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))) {
 		/*