---

yaml --- r: 256861 b: refs/heads/master c: 479bf98 h: refs/heads/master i: 256859: 6dd0513 v: v3
git-mirror · Jun 27, 2011 · 98e9c66 · 98e9c66
1 parent 87104d8
commit 98e9c66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb3696da89743d580f869142d0a6e6ba9b7fe89a
+refs/heads/master: 479bf98c1c29b40d86e40a4e6e4944c2f03d9493
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
@@ -1599,8 +1599,7 @@ static int wait_consider_task(struct wait_opts *wo, int ptrace,
 		 * own children, it should create a separate process which
 		 * takes the role of real parent.
 		 */
-		if (likely(!ptrace) && p->ptrace &&
-		    same_thread_group(p->parent, p->real_parent))
+		if (likely(!ptrace) && p->ptrace && !ptrace_reparented(p))
 			return 0;
 
 		/*