From dba9bc72387d3eafb25c4c67862646ad032e87bb Mon Sep 17 00:00:00 2001 From: Deng-Cheng Zhu Date: Fri, 21 Jan 2011 16:19:19 +0800 Subject: [PATCH] --- yaml --- r: 234153 b: refs/heads/master c: c049b6a5f2d8ca16094a4f2a6d8ad39f888a551a h: refs/heads/master i: 234151: ecb1643636b234b37270a9928bcb1cef9d1c2ecc v: v3 --- [refs] | 2 +- trunk/arch/mips/kernel/perf_event.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dcfec5b3dc97..e21a5a034137 100644 --- 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 index 1ee44a3f9718..3d55761146e5 100644 --- 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; }