From 6d581f6354a33d6d36f04ce0c2b9af15bab39f72 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Wed, 23 Sep 2009 15:56:47 -0700
Subject: [PATCH] --- yaml --- r: 165675 b: refs/heads/master c:
 b4fe51823d797d6959b2eee7868023e61606daa9 h: refs/heads/master i:   165673:
 239e7f01ab904505819aee9a79b0963d7462e402   165671:
 7256f45b0eb7cd6eb02f9f9ef9886b42bbc7d8c5 v: v3

---
 [refs]              | 2 +-
 trunk/kernel/exit.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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);
 }