diff --git a/[refs] b/[refs]
index a71672a23e43..2a9516be86d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b7570e77f7c3abd43107dabc47ea89daf9a1cba
+refs/heads/master: b4fe51823d797d6959b2eee7868023e61606daa9
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index 7838b4d68774..270a68b7f22f 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -1581,6 +1581,9 @@ static int child_wait_callback(wait_queue_t *wait, unsigned mode,
 	if (!eligible_child(wo, p))
 		return 0;
 
+	if ((wo->wo_flags & __WNOTHREAD) && wait->private != p->parent)
+		return 0;
+
 	return default_wake_function(wait, mode, sync, key);
 }