perf: x86, convert to new API pmu->init_event
Subsystems (2)
RFC PATCH 4/9 perf: x86, convert to new API pmu->init_event
perf: x86, convert to new API pmu->init_event
Signed-off-by Lin Ming <[email protected]>
--- arch/x86/kernel/cpu/perf_event.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-)
arch/x86/kernel/cpu/perf_event.c +17 -15
@@ -1362,6 +1362,8 @@ void __init init_hw_perf_events(void)pr_info ("... event mask: %016Lx\n" , x86_pmu.intel_ctrl);perf_cpu_notifier (x86_pmu_notifier); + +perf_event_register_pmu (&pmu); }static inline void x86_pmu_read (struct perf_event *event)
@@ -1422,18 +1424,6 @@ static int x86_pmu_commit_txn(struct pmu *pmu)return 0 ; } -static struct pmu pmu = { - .enable = x86_pmu_enable, - .disable = x86_pmu_disable, - .start = x86_pmu_start, - .stop = x86_pmu_stop, - .read = x86_pmu_read, - .unthrottle = x86_pmu_unthrottle, - .start_txn = x86_pmu_start_txn, - .cancel_txn = x86_pmu_cancel_txn, - .commit_txn = x86_pmu_commit_txn, -}; -/* * validate that we can schedule this event */
@@ -1508,7 +1498,7 @@ out:return ret; } -struct pmu *hw_perf_event_init (struct perf_event *event) +static int x86_pmu_init_event (struct perf_event *event) {struct pmu *tmp;int err;
@@ -1533,12 +1523,24 @@ struct pmu *hw_perf_event_init(struct perf_event *event)if (err) {if (event->destroy) event->destroy (event); -return ERR_PTR (err); } -return &pmu; +return err; } +static struct pmu pmu = { + .enable = x86_pmu_enable, + .disable = x86_pmu_disable, + .start = x86_pmu_start, + .stop = x86_pmu_stop, + .read = x86_pmu_read, + .unthrottle = x86_pmu_unthrottle, + .start_txn = x86_pmu_start_txn, + .cancel_txn = x86_pmu_cancel_txn, + .commit_txn = x86_pmu_commit_txn, + .init_event = x86_pmu_init_event, +}; +/* * callchain support */