diff --git a/[refs] b/[refs]
index fef822eb16c8..ec84e0d46e8c 100644
--- 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
index 167e1e3ad7c6..d2e8239ea187 100644
--- 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)) {