diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /kernel/fork.c | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index f30adb908..2fbb08e32 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -647,8 +647,11 @@ int do_fork(unsigned long clone_flags, unsigned long usp, struct pt_regs *regs) p->run_list.next = NULL; p->run_list.prev = NULL; - if ((clone_flags & CLONE_VFORK) || !(clone_flags & CLONE_PARENT)) - p->p_pptr = p->p_opptr = current; + if ((clone_flags & CLONE_VFORK) || !(clone_flags & CLONE_PARENT)) { + p->p_opptr = current; + if (!(current->flags & PF_PTRACED)) + p->p_pptr = current; + } p->p_cptr = NULL; init_waitqueue_head(&p->wait_chldexit); p->vfork_sem = NULL; @@ -748,8 +751,7 @@ bad_fork_cleanup_fs: bad_fork_cleanup_files: exit_files(p); /* blocking */ bad_fork_cleanup: - if (p->exec_domain && p->exec_domain->module) - __MOD_DEC_USE_COUNT(p->exec_domain->module); + put_exec_domain(p->exec_domain); if (p->binfmt && p->binfmt->module) __MOD_DEC_USE_COUNT(p->binfmt->module); bad_fork_cleanup_count: |