From 45cf26c7e63351cc7e6022d4b8bfd9a293f3eb88 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Thu, 2 Sep 2010 09:32:08 +0100
Subject: [PATCH] --- yaml --- r: 210431 b: refs/heads/master c:
 65b4711ff513767341aa1915c822de6ec0de65cb h: refs/heads/master i:   210429:
 0833bc24fd840af804b69fc391feedc4f689ee03   210427:
 06953fd13e4820112fb58978872da5b313fba400   210423:
 6f0c4526fa69532b73c2248878f2469ffb761591   210415:
 40b1317265493c3f35ecf6e004c0c0336ccf8b5d   210399:
 4cb014675723eee90bf1f7ab26e07b940f73647c   210367:
 66b40c41df84fb34774cb68bc3fd8b4301a4516d   210303:
 de6154b4475bb3d115726ed552ac69f97b707dad   210175:
 1df5364ba0ccc5cbe1f2fdd5be4752fdfa02f834   209919:
 9cf3cd8e43b557bc0e888142d517c53d9cbb544b v: v3

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

diff --git a/[refs] b/[refs]
index b3b783722dda..bc68a294887e 100644
--- 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
index e2139256524e..ecbb0288e5dd 100644
--- 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;
 }