---

yaml --- r: 270139 b: refs/heads/master c: 7325eae h: refs/heads/master i: 270137: 0951736 270135: 751d10e v: v3
git-mirror · Aug 31, 2011 · f262067 · f262067
1 parent 5c17582
commit f262067
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git 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
@@ -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();