From f28ac45b945173a28a4406f5cf639109d1c83312 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Wed, 6 Feb 2008 01:37:06 -0800
Subject: [PATCH] --- yaml --- r: 83423 b: refs/heads/master c:
 0a76fe8e50ee93a9d4a1badb1ec995852a6bcaf1 h: refs/heads/master i:   83421:
 0d6e5b7998251ffc58e5aba4244b94f0830a0e92   83419:
 34c265c2ef357565f5f9979df96eda5cd33242b9   83415:
 24a27b529ead53f4494b85c365e33afe99d846da   83407:
 d330ddc04cd81ac2fcb88d863e74ef4e192f2243   83391:
 12674d51df45eec62dec544202960ce7e79ba72b v: v3

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

diff --git a/[refs] b/[refs]
index b65ccf404cd4..6c1e4e827f94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f10db6277dfd6dffb80b2182a256d35adb3134bc
+refs/heads/master: 0a76fe8e50ee93a9d4a1badb1ec995852a6bcaf1
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index 9d3d0f0b27d9..eb9934a82fc1 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -1590,8 +1590,6 @@ static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
 					goto repeat;
 				if (retval != 0) /* He released the lock.  */
 					goto end;
-			} else if (p->exit_state == EXIT_DEAD) {
-				continue;
 			} else if (p->exit_state == EXIT_ZOMBIE) {
 				/*
 				 * Eligible but we cannot release it yet:
@@ -1606,7 +1604,7 @@ static long do_wait(pid_t pid, int options, struct siginfo __user *infop,
 				/* He released the lock.  */
 				if (retval != 0)
 					goto end;
-			} else {
+			} else if (p->exit_state != EXIT_DEAD) {
 check_continued:
 				/*
 				 * It's running now, so it might later