From f262067493fdb1fb3a8c1148c315a4e5dc06a5f1 Mon Sep 17 00:00:00 2001
From: Mark Rutland <mark.rutland@arm.com>
Date: Tue, 23 Aug 2011 11:59:49 +0100
Subject: [PATCH] --- yaml --- r: 270139 b: refs/heads/master c:
 7325eaec439cd0cc8c9b61b59d41d99abace1b23 h: refs/heads/master i:   270137:
 0951736f1752eeb2af4c6aa478638d935ff69533   270135:
 751d10ed84b57e252307c5ceb2b272029d017d1e v: v3

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

diff --git a/[refs] b/[refs]
index 511642f69840..731f05aa2b90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ce47080dfffe71edd433b35dcdada24c61079eb
+refs/heads/master: 7325eaec439cd0cc8c9b61b59d41d99abace1b23
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index aaa631b8cbc2..e6e5d7c84f1a 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -12,6 +12,7 @@
  */
 #define pr_fmt(fmt) "hw perfevents: " fmt
 
+#include <linux/bitmap.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -557,20 +558,9 @@ static int armpmu_event_init(struct perf_event *event)
 
 static void armpmu_enable(struct pmu *pmu)
 {
-	/* Enable all of the perf events on hardware. */
 	struct arm_pmu *armpmu = to_arm_pmu(pmu);
-	int idx, enabled = 0;
 	struct pmu_hw_events *hw_events = armpmu->get_hw_events();
-
-	for (idx = 0; idx < armpmu->num_events; ++idx) {
-		struct perf_event *event = hw_events->events[idx];
-
-		if (!event)
-			continue;
-
-		armpmu->enable(&event->hw, idx);
-		enabled = 1;
-	}
+	int enabled = bitmap_weight(hw_events->used_mask, armpmu->num_events);
 
 	if (enabled)
 		armpmu->start();