---

yaml --- r: 83423 b: refs/heads/master c: 0a76fe8 h: refs/heads/master i: 83421: 0d6e5b7 83419: 34c265c 83415: 24a27b5 83407: d330ddc 83391: 12674d5 v: v3
git-mirror · Feb 6, 2008 · f28ac45 · f28ac45
1 parent df4dd24
commit f28ac45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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