[patch 17/40] powerpc: perf: Convert book3s notifier to state machine callbacks

[Thomas Gleixner]

Signed-off-by: Thomas Gleixner <t...@linutronix.de>
---
 arch/powerpc/perf/core-book3s.c |   29 ++++++-----------------------
 include/linux/cpuhotplug.h      |    1 +
 2 files changed, 7 insertions(+), 23 deletions(-)

Index: linux-2.6/arch/powerpc/perf/core-book3s.c
===================================================================
--- linux-2.6.orig/arch/powerpc/perf/core-book3s.c
+++ linux-2.6/arch/powerpc/perf/core-book3s.c
@@ -1501,31 +1501,15 @@ static void perf_event_interrupt(struct 
                irq_exit();
 }
 
-static void power_pmu_setup(int cpu)
+int __cpuinit 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 __cpuinit
-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 __cpuinit register_power_pmu(struct power_pmu *pmu)
@@ -1546,7 +1530,6 @@ int __cpuinit register_power_pmu(struct 
 #endif /* CONFIG_PPC64 */
 
        perf_pmu_register(&power_pmu, "cpu", PERF_TYPE_RAW);
-       perf_cpu_notifier(power_pmu_notifier);
-
+       cpuhp_setup_state(CPUHP_PERF_POWER, power_pmu_prepare_cpu, NULL);
        return 0;
 }
Index: linux-2.6/include/linux/cpuhotplug.h
===================================================================
--- linux-2.6.orig/include/linux/cpuhotplug.h
+++ linux-2.6/include/linux/cpuhotplug.h
@@ -7,6 +7,7 @@ enum cpuhp_states {
        CPUHP_PERF_X86_UNCORE_PREP,
        CPUHP_PERF_X86_PREPARE,
        CPUHP_PERF_BFIN,
+       CPUHP_PERF_POWER,
        CPUHP_PERF_PREPARE,
        CPUHP_NOTIFY_PREPARE,
        CPUHP_NOTIFY_DEAD,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/