From e05a6cb30a9ed40375b787c0840158288860f962 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Thu, 2 Apr 2009 16:58:16 -0700
Subject: [PATCH] --- yaml --- r: 139692 b: refs/heads/master c:
 b1442b055c154699a6a2c436f3352f71b6beede3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f8a61d57712b..439d71db6f3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a967a044a777e8b9c739120927114ddc0094298
+refs/heads/master: b1442b055c154699a6a2c436f3352f71b6beede3
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index 405e6877168b..5be0a406faeb 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -832,7 +832,7 @@ static void reparent_thread(struct task_struct *p, struct task_struct *father)
 	/* If we'd notified the old parent about this child's death,
 	 * also notify the new parent.
 	 */
-	if (!ptrace_reparented(p) &&
+	if (!p->ptrace &&
 	    p->exit_state == EXIT_ZOMBIE && thread_group_empty(p))
 		do_notify_parent(p, p->exit_signal);