diff --git a/[refs] b/[refs] index fa761fa3b151..36548abcd370 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9abd1ace43d6186268856dbec2ebf411218d6ca +refs/heads/master: 9f59ce5d0e0dd837853385927b150f5cef3a7f52 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 1b0f7b1e0881..aa36c43783cc 100644 --- a/trunk/kernel/fork.c +++ b/trunk/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);