From 7bc33fc43edf6b01722f80fa1343851b16607e8b Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Tue, 13 Nov 2007 22:11:50 -0800
Subject: [PATCH] --- yaml --- r: 73818 b: refs/heads/master c:
 a3474224e6a01924be40a8255636ea5522c1023a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 385ea3defdaf..ca6775f0390c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99fee6d7e5748d96884667a4628118f7fc130ea0
+refs/heads/master: a3474224e6a01924be40a8255636ea5522c1023a
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index f1aec27f1df0..cd0f1d4137a7 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -1386,8 +1386,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader,
 		int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED;
 
 		exit_code = p->exit_code;
-		if (unlikely(!exit_code) ||
-		    unlikely(p->state & TASK_TRACED))
+		if (unlikely(!exit_code) || unlikely(p->exit_state))
 			goto bail_ref;
 		return wait_noreap_copyout(p, pid, uid,
 					   why, (exit_code << 8) | 0x7f,