diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-11-25 04:53:27 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-11-25 04:53:27 -0500 |
| commit | 058250a0d5886b4d96a195ecc7e3a75e2df5e4b1 (patch) | |
| tree | fb67e8f5258c6aa11d4e8c39650e23de7556b38d /kernel/exit.c | |
| parent | cea218054ad277d6c126890213afde07b4eb1602 (diff) | |
| parent | 2ffbb8377c7a0713baf6644e285adc27a5654582 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index f1aec27f1df0..cd0f1d4137a7 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -1386,8 +1386,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, | |||
| 1386 | int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED; | 1386 | int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED; |
| 1387 | 1387 | ||
| 1388 | exit_code = p->exit_code; | 1388 | exit_code = p->exit_code; |
| 1389 | if (unlikely(!exit_code) || | 1389 | if (unlikely(!exit_code) || unlikely(p->exit_state)) |
| 1390 | unlikely(p->state & TASK_TRACED)) | ||
| 1391 | goto bail_ref; | 1390 | goto bail_ref; |
| 1392 | return wait_noreap_copyout(p, pid, uid, | 1391 | return wait_noreap_copyout(p, pid, uid, |
| 1393 | why, (exit_code << 8) | 0x7f, | 1392 | why, (exit_code << 8) | 0x7f, |