diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-06 15:44:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-06 15:44:39 -0700 |
| commit | dbd43d08642c037beb937c2670976c076120507b (patch) | |
| tree | 4d44a4b54a731eb290e040345c38ed9e1e7ecc6a /kernel/fork.c | |
| parent | c34c07d6946ec8969fa71ba03dbb95091f4eb9d3 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master' of /home/greg/linux/git/torvalds-2.6/
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 1b0f7b1e088..aa36c43783c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1387,8 +1387,10 @@ long do_fork(unsigned long clone_flags, if (clone_flags & CLONE_VFORK) { wait_for_completion(&vfork); - if (unlikely (current->ptrace & PT_TRACE_VFORK_DONE)) + if (unlikely (current->ptrace & PT_TRACE_VFORK_DONE)) { + current->ptrace_message = nr; ptrace_notify ((PTRACE_EVENT_VFORK_DONE << 8) | SIGTRAP); + } } } else { free_pid(pid); |