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;