diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:48:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:48:49 -0400 |
| commit | 0fbbbf2bde4da5cb01a949c3d7b21c0627f520a8 (patch) | |
| tree | f081ef10f3067b28a1ee316a8e7292eeda143419 /kernel/exit.c | |
| parent | 54f00389563c80fa1de250a21256313ba01ca07d (diff) | |
| parent | 2b235826098bb653982894dfc3f70fd029f6c2e4 (diff) | |
Merge libata upstream (which includes C/H/S support) include irq-pio branch.
Merge branch 'upstream'
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index ee6d8b8abef5..43077732619b 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -1203,7 +1203,7 @@ static int wait_task_stopped(task_t *p, int delayed_group_leader, int noreap, | |||
| 1203 | 1203 | ||
| 1204 | exit_code = p->exit_code; | 1204 | exit_code = p->exit_code; |
| 1205 | if (unlikely(!exit_code) || | 1205 | if (unlikely(!exit_code) || |
| 1206 | unlikely(p->state > TASK_STOPPED)) | 1206 | unlikely(p->state & TASK_TRACED)) |
| 1207 | goto bail_ref; | 1207 | goto bail_ref; |
| 1208 | return wait_noreap_copyout(p, pid, uid, | 1208 | return wait_noreap_copyout(p, pid, uid, |
| 1209 | why, (exit_code << 8) | 0x7f, | 1209 | why, (exit_code << 8) | 0x7f, |