From e6892f07a73af66a1cb7868c68caa50816c9e871 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Thu, 16 Jul 2009 15:44:29 +0200
Subject: [PATCH] --- yaml --- r: 155704 b: refs/heads/master c:
 ed900c054b541254f0ce5cedaf75206e29bd614e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3d399f5bcc4d..795be3199482 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11b5f81e1b0ea0bc84fe32f0a27054e052b2bf84
+refs/heads/master: ed900c054b541254f0ce5cedaf75206e29bd614e
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 467746b3f0aa..4812d60b29f8 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -1408,14 +1408,11 @@ long do_fork(unsigned long clone_flags,
 		if (clone_flags & CLONE_VFORK) {
 			p->vfork_done = &vfork;
 			init_completion(&vfork);
-		} else if (!(clone_flags & CLONE_VM)) {
-			/*
-			 * vfork will do an exec which will call
-			 * set_task_comm()
-			 */
-			perf_counter_fork(p);
 		}
 
+		if (!(clone_flags & CLONE_THREAD))
+			perf_counter_fork(p);
+
 		audit_finish_fork(p);
 		tracehook_report_clone(regs, clone_flags, nr, p);