From 697604d26a67e2e8e7e2290ef9e98e64796a9253 Mon Sep 17 00:00:00 2001
From: Chuck Ebbert <76306.1226@compuserve.com>
Date: Sat, 5 Aug 2006 12:14:11 -0700
Subject: [PATCH] --- yaml --- r: 33231 b: refs/heads/master c:
 9f59ce5d0e0dd837853385927b150f5cef3a7f52 h: refs/heads/master i:   33229:
 b71f9215f5abb5e697fd731dbb2faa4121b9b811   33227:
 b6c1e1901910a5fdc14b70fa2bd66a129d211d2d   33223:
 6e5a9cc4659c72b107267e658860158765ea35bb   33215:
 d8ddba9662e6bf823e752339b74964edd92c5668 v: v3

---
 [refs]              | 2 +-
 trunk/kernel/fork.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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);