From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Wed, 6 Feb 2008 09:37:06 +0000 (-0800)
Subject: do_wait: remove one "else if" branch
X-Git-Tag: v2.6.25-rc1~724
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0a76fe8e50ee93a9d4a1badb1ec995852a6bcaf1;p=linux-2.6-omap-h63xx.git

do_wait: remove one "else if" branch

Minor cleanup. We can remove one "else if" branch.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/kernel/exit.c b/kernel/exit.c
index 9d3d0f0b27d..eb9934a82fc 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1590,8 +1590,6 @@ repeat:
 					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 @@ repeat:
 				/* 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