Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0a76fe8e50ee93a9d4a1badb1ec995852a6bcaf1

Authored by Oleg Nesterov
Committed by Linus Torvalds
1 parent f10db6277d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

... ... @@ -1590,8 +1590,6 @@
1590 1590 goto repeat;
1591 1591 if (retval != 0) /* He released the lock. */
1592 1592 goto end;
1593   - } else if (p->exit_state == EXIT_DEAD) {
1594   - continue;
1595 1593 } else if (p->exit_state == EXIT_ZOMBIE) {
1596 1594 /*
1597 1595 * Eligible but we cannot release it yet:
... ... @@ -1606,7 +1604,7 @@
1606 1604 /* He released the lock. */
1607 1605 if (retval != 0)
1608 1606 goto end;
1609   - } else {
  1607 + } else if (p->exit_state != EXIT_DEAD) {
1610 1608 check_continued:
1611 1609 /*
1612 1610 * It's running now, so it might later