diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-23 23:38:17 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-23 23:38:17 +0100 |
| commit | 901e7e34f83fc8fb4ce82cb29e5b500b7559cd86 (patch) | |
| tree | e3d42fb45f005560a43f195177a98e752ac4737a /arch/arm/kernel/perf_event.c | |
| parent | 8754c4bf2ac1a64d5c1409a0ae98e21a8f3541c5 (diff) | |
| parent | 2dfcb802d6bd54a2353678c6434846d94b058f2c (diff) | |
Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
| -rw-r--r-- | arch/arm/kernel/perf_event.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c index e186ee1e63f..bc3f2efa0d8 100644 --- a/arch/arm/kernel/perf_event.c +++ b/arch/arm/kernel/perf_event.c @@ -256,12 +256,11 @@ validate_event(struct pmu_hw_events *hw_events, struct perf_event *event) { struct arm_pmu *armpmu = to_arm_pmu(event->pmu); - struct pmu *leader_pmu = event->group_leader->pmu; if (is_software_event(event)) return 1; - if (event->pmu != leader_pmu || event->state < PERF_EVENT_STATE_OFF) + if (event->state < PERF_EVENT_STATE_OFF) return 1; if (event->state == PERF_EVENT_STATE_OFF && !event->attr.enable_on_exec) |