diff --git a/[refs] b/[refs] index 7aa11c69e64b..973dc6b06410 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a515e4a62dbf7e4c213740268a5267faa69e5b2 +refs/heads/master: c543f1ee08ea6c2176dbdc47df0d0f6357c88713 diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index dee8b4d63403..42a8713b2050 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -1196,10 +1196,6 @@ static int wait_task_zombie(struct task_struct *p, int noreap, int exit_code = p->exit_code; int why, status; - if (unlikely(p->exit_state != EXIT_ZOMBIE)) - return 0; - if (unlikely(p->exit_signal == -1 && p->ptrace == 0)) - return 0; get_task_struct(p); read_unlock(&tasklist_lock); if ((exit_code & 0x7f) == 0) {