|
@@ -2158,31 +2158,15 @@ static void perf_event_interrupt(struct pt_regs *regs)
|
|
|
irq_exit();
|
|
|
}
|
|
|
|
|
|
-static void power_pmu_setup(int cpu)
|
|
|
+int power_pmu_prepare_cpu(unsigned int cpu)
|
|
|
{
|
|
|
struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu);
|
|
|
|
|
|
- if (!ppmu)
|
|
|
- return;
|
|
|
- memset(cpuhw, 0, sizeof(*cpuhw));
|
|
|
- cpuhw->mmcr[0] = MMCR0_FC;
|
|
|
-}
|
|
|
-
|
|
|
-static int
|
|
|
-power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
|
|
|
-{
|
|
|
- unsigned int cpu = (long)hcpu;
|
|
|
-
|
|
|
- switch (action & ~CPU_TASKS_FROZEN) {
|
|
|
- case CPU_UP_PREPARE:
|
|
|
- power_pmu_setup(cpu);
|
|
|
- break;
|
|
|
-
|
|
|
- default:
|
|
|
- break;
|
|
|
+ if (ppmu) {
|
|
|
+ memset(cpuhw, 0, sizeof(*cpuhw));
|
|
|
+ cpuhw->mmcr[0] = MMCR0_FC;
|
|
|
}
|
|
|
-
|
|
|
- return NOTIFY_OK;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
int register_power_pmu(struct power_pmu *pmu)
|
|
@@ -2205,7 +2189,7 @@ int register_power_pmu(struct power_pmu *pmu)
|
|
|
#endif /* CONFIG_PPC64 */
|
|
|
|
|
|
perf_pmu_register(&power_pmu, "cpu", PERF_TYPE_RAW);
|
|
|
- perf_cpu_notifier(power_pmu_notifier);
|
|
|
-
|
|
|
+ cpuhp_setup_state(CPUHP_PERF_POWER, "PERF_POWER",
|
|
|
+ power_pmu_prepare_cpu, NULL);
|
|
|
return 0;
|
|
|
}
|