diff options
| author | Benjamin LaHaise <bcrl@toomuch.toronto.redhat.com> | 2002-08-21 10:32:55 -0400 |
|---|---|---|
| committer | Benjamin LaHaise <bcrl@toomuch.toronto.redhat.com> | 2002-08-21 10:32:55 -0400 |
| commit | 555dbefdfe6bfa613ebf59852ba82872dcc44233 (patch) | |
| tree | 2ccbed4f787cccc6d93d41e0dca9bfda426b93a1 /kernel | |
| parent | ea5097be4e814a2a9457e60653052306295941e8 (diff) | |
| parent | d17e9bb6daa227e88f596fd0918e3af20e423261 (diff) | |
Merge toomuch.toronto.redhat.com:/md0/linux-2.5
into toomuch.toronto.redhat.com:/md0/net-aio/bk/aio-2.5
Diffstat (limited to 'kernel')
| -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 f2390db88ab6..6526b6b94849 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -731,7 +731,7 @@ repeat: tsk = next_thread(tsk); } while (tsk != current); read_unlock(&tasklist_lock); - if (flag) { + if (flag || !list_empty(¤t->ptrace_children)) { retval = 0; if (options & WNOHANG) goto end_wait4; |