diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
| commit | 242898be7a1921f646ca529ddc26d7337c69922f (patch) | |
| tree | 674adf64ca6254318dab5bcd428ebe8ac73957ff /kernel/fork.c | |
| parent | 6bbad18a8b18228fa65d73547dfd5efad1515ef8 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master' into upstream
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); |