---

yaml --- r: 234153 b: refs/heads/master c: c049b6a h: refs/heads/master i: 234151: ecb1643 v: v3
git-mirror · Mar 14, 2011 · dba9bc7 · dba9bc7
1 parent 2ddca10
commit dba9bc7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 404ff638403e9286691b9b1f86d514c1d7737e8f
+refs/heads/master: c049b6a5f2d8ca16094a4f2a6d8ad39f888a551a
diff --git a/trunk/arch/mips/kernel/perf_event.c b/trunk/arch/mips/kernel/perf_event.c
@@ -486,8 +486,9 @@ static int validate_event(struct cpu_hw_events *cpuc,
 {
 	struct hw_perf_event fake_hwc = event->hw;
 
-	if (event->pmu && event->pmu != &pmu)
-		return 0;
+	/* Allow mixed event group. So return 1 to pass validation. */
+	if (event->pmu != &pmu || event->state <= PERF_EVENT_STATE_OFF)
+		return 1;
 
 	return mipspmu->alloc_counter(cpuc, &fake_hwc) >= 0;
 }