|
@@ -352,28 +352,12 @@ static struct pmu pmu = {
|
|
|
.read = sh_pmu_read,
|
|
|
};
|
|
|
|
|
|
-static void sh_pmu_setup(int cpu)
|
|
|
+static int sh_pmu_prepare_cpu(unsigned int cpu)
|
|
|
{
|
|
|
struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu);
|
|
|
|
|
|
memset(cpuhw, 0, sizeof(struct cpu_hw_events));
|
|
|
-}
|
|
|
-
|
|
|
-static int
|
|
|
-sh_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:
|
|
|
- sh_pmu_setup(cpu);
|
|
|
- break;
|
|
|
-
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- return NOTIFY_OK;
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
int register_sh_pmu(struct sh_pmu *_pmu)
|
|
@@ -394,6 +378,7 @@ int register_sh_pmu(struct sh_pmu *_pmu)
|
|
|
WARN_ON(_pmu->num_events > MAX_HWEVENTS);
|
|
|
|
|
|
perf_pmu_register(&pmu, "cpu", PERF_TYPE_RAW);
|
|
|
- perf_cpu_notifier(sh_pmu_notifier);
|
|
|
+ cpuhp_setup_state(CPUHP_PERF_SUPERH, "PERF_SUPERH", sh_pmu_prepare_cpu,
|
|
|
+ NULL);
|
|
|
return 0;
|
|
|
}
|