From 8bb572204e2f2564a37c24b511f744e940775d21 Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Wed, 27 Apr 2011 16:22:21 +0100 Subject: [PATCH] --- yaml --- r: 270126 b: refs/heads/master c: 7b9f72c62ed047a200b1ef8c70bee0b58e880af8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/perf_event.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e88659f527ff..6631d69cc2ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48957155f8791964d8567479e6986f88343aba38 +refs/heads/master: 7b9f72c62ed047a200b1ef8c70bee0b58e880af8 diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c index 753648cf9af6..dfde9283aec1 100644 --- a/trunk/arch/arm/kernel/perf_event.c +++ b/trunk/arch/arm/kernel/perf_event.c @@ -348,8 +348,9 @@ validate_event(struct cpu_hw_events *cpuc, struct perf_event *event) { struct hw_perf_event fake_event = event->hw; + struct pmu *leader_pmu = event->group_leader->pmu; - if (event->pmu != &pmu || event->state <= PERF_EVENT_STATE_OFF) + if (event->pmu != leader_pmu || event->state <= PERF_EVENT_STATE_OFF) return 1; return armpmu->get_event_idx(cpuc, &fake_event) >= 0;