diff options
| author |   Will Deacon <will.deacon@arm.com> | 2011-08-31 10:50:37 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2011-08-31 10:50:37 +0100 |
| commit | 4fb0d2ea397ab207fdecbd88ad0e37b36ce68a62 (patch) | |
| tree | f0ebe12652b7ad1c2fc5016dfb31b633b7458a3f /kernel | |
| parent | ARM: hw_breakpoint: reduce the number of WARN_ONCE invocations (diff) | |
| parent | ARM: perf: Remove unnecessary armpmu->enable()s (diff) | |
| download | wireguard-linux-4fb0d2ea397ab207fdecbd88ad0e37b36ce68a62.tar.xz wireguard-linux-4fb0d2ea397ab207fdecbd88ad0e37b36ce68a62.zip | |
Merge branches 'hwbreak', 'perf/updates' and 'perf/system-pmus' into for-rmk
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index b8785e26ee1c..68c8017de969 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5715,6 +5715,7 @@ struct pmu *perf_init_event(struct perf_event *event) pmu = idr_find(&pmu_idr, event->attr.type); rcu_read_unlock(); if (pmu) { + event->pmu = pmu; ret = pmu->event_init(event); if (ret) pmu = ERR_PTR(ret); @@ -5722,6 +5723,7 @@ struct pmu *perf_init_event(struct perf_event *event) } list_for_each_entry_rcu(pmu, &pmus, entry) { + event->pmu = pmu; ret = pmu->event_init(event); if (!ret) goto unlock; @@ -5848,8 +5850,6 @@ done: return ERR_PTR(err); } - event->pmu = pmu; - if (!event->parent) { if (event->attach_state & PERF_ATTACH_TASK) jump_label_inc(&perf_sched_events); |