From 273edf356a3413ca39b88a256c8e80d5a881bc16 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Wed, 30 Apr 2008 00:53:14 -0700
Subject: [PATCH] --- yaml --- r: 95153 b: refs/heads/master c:
 68cb94786630b34196713794a2880ade17fca887 h: refs/heads/master i:   95151:
 7dedeb5664d65d945bc4971236c131fafe54e172 v: v3

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

diff --git a/[refs] b/[refs]
index e680f45d3668..401304bedbcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53b6f9fbd3b63af14b4f6268e8b5b80d178d05bc
+refs/heads/master: 68cb94786630b34196713794a2880ade17fca887
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index dac4b4e57293..ce66d66881fd 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -73,7 +73,7 @@ void __ptrace_unlink(struct task_struct *child)
 	BUG_ON(!child->ptrace);
 
 	child->ptrace = 0;
-	if (!list_empty(&child->ptrace_list)) {
+	if (ptrace_reparented(child)) {
 		list_del_init(&child->ptrace_list);
 		remove_parent(child);
 		child->parent = child->real_parent;