---

yaml --- r: 146417 b: refs/heads/master c: 78a3d9d h: refs/heads/master i: 146415: 7c5f48e v: v3
git-mirror · Apr 30, 2009 · fea9f8e · fea9f8e
1 parent c3c6373
commit fea9f8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecd6de3c88e8cbcad175b2eab48ba05c2014f7b6
+refs/heads/master: 78a3d9d5654a7fd99cf8b2ab06b9497b9c7aad64
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
@@ -1582,6 +1582,7 @@ static int wait_consider_task(struct task_struct *parent, int ptrace,
 		 */
 		if (*notask_error)
 			*notask_error = ret;
+		return 0;
 	}
 
 	if (likely(!ptrace) && unlikely(p->ptrace)) {