---

yaml --- r: 210431 b: refs/heads/master c: 65b4711 h: refs/heads/master i: 210429: 0833bc2 210427: 06953fd 210423: 6f0c452 210415: 40b1317 210399: 4cb0146 210367: 66b40c4 210303: de6154b 210175: 1df5364 209919: 9cf3cd8 v: v3
git-mirror · Sep 2, 2010 · 45cf26c · 45cf26c
1 parent b5268d6
commit 45cf26c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 026b5ca3b65f878019a8eb0c7a702cd5c20a4104
+refs/heads/master: 65b4711ff513767341aa1915c822de6ec0de65cb
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
@@ -319,8 +319,8 @@ validate_event(struct cpu_hw_events *cpuc,
 {
 	struct hw_perf_event fake_event = event->hw;
 
-	if (event->pmu && event->pmu != &pmu)
-		return 0;
+	if (event->pmu != &pmu || event->state <= PERF_EVENT_STATE_OFF)
+		return 1;
 
 	return armpmu->get_event_idx(cpuc, &fake_event) >= 0;
 }