diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-05 02:35:43 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-05 02:35:43 (GMT) |
| commit | 117ff42fd43e92d24c6aa6f3e4f0f1e1edada140 (patch) | |
| tree | c08e1c0357fde481a16489b77feb8f6073faf538 /kernel/exit.c | |
| parent | 1d5783030a14d1b6ee763f63c8136e581f48b365 (diff) | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
| download | linux-fsl-qoriq-117ff42fd43e92d24c6aa6f3e4f0f1e1edada140.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index d0b7d98..e6e01b9 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -1540,8 +1540,15 @@ static int wait_consider_task(struct wait_opts *wo, int ptrace, } /* dead body doesn't have much to contribute */ - if (p->exit_state == EXIT_DEAD) + if (unlikely(p->exit_state == EXIT_DEAD)) { + /* + * But do not ignore this task until the tracer does + * wait_task_zombie()->do_notify_parent(). + */ + if (likely(!ptrace) && unlikely(ptrace_reparented(p))) + wo->notask_error = 0; return 0; + } /* slay zombie? */ if (p->exit_state == EXIT_ZOMBIE) { |