diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/kernel/perf_event.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/perf_event.c b/arch/mips/kernel/perf_event.c index 1ee44a3f9718..3d55761146e5 100644 --- a/arch/mips/kernel/perf_event.c +++ b/arch/mips/kernel/perf_event.c | |||
@@ -486,8 +486,9 @@ static int validate_event(struct cpu_hw_events *cpuc, | |||
486 | { | 486 | { |
487 | struct hw_perf_event fake_hwc = event->hw; | 487 | struct hw_perf_event fake_hwc = event->hw; |
488 | 488 | ||
489 | if (event->pmu && event->pmu != &pmu) | 489 | /* Allow mixed event group. So return 1 to pass validation. */ |
490 | return 0; | 490 | if (event->pmu != &pmu || event->state <= PERF_EVENT_STATE_OFF) |
491 | return 1; | ||
491 | 492 | ||
492 | return mipspmu->alloc_counter(cpuc, &fake_hwc) >= 0; | 493 | return mipspmu->alloc_counter(cpuc, &fake_hwc) >= 0; |
493 | } | 494 | } |