From febc5533f66038b45d32d247df9b811dc8b9d117 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 1 Jul 2011 14:38:12 +0100
Subject: [PATCH] --- yaml --- r: 254777 b: refs/heads/master c:
 f4f38430c94c38187db73a2cf3892cc8b12a2713 h: refs/heads/master i:   254775:
 3b9db5ae8c3030c6b91a6a1db31accdd3ad79695 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/perf_event.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ccdb6089ee7f..d7755afb54ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 178783622ce0fd629fad21b33b8f8f56b64c5e45
+refs/heads/master: f4f38430c94c38187db73a2cf3892cc8b12a2713
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index d53c0abc4dd3..2b5b1421596c 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -583,7 +583,7 @@ static int armpmu_event_init(struct perf_event *event)
 static void armpmu_enable(struct pmu *pmu)
 {
 	/* Enable all of the perf events on hardware. */
-	int idx;
+	int idx, enabled = 0;
 	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
 
 	if (!armpmu)
@@ -596,9 +596,11 @@ static void armpmu_enable(struct pmu *pmu)
 			continue;
 
 		armpmu->enable(&event->hw, idx);
+		enabled = 1;
 	}
 
-	armpmu->start();
+	if (enabled)
+		armpmu->start();
 }
 
 static void armpmu_disable(struct pmu *pmu)