Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-zesty-kernel.git] / arch / s390 / kernel / perf_cpum_sf.c

diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
index 53acf2d76fa9809527e9d0869e4a5db8b7d48c1f..fcc634c1479a1ed1d7cd05592d2b8c0ae59a408d 100644 (file)
--- a/arch/s390/kernel/perf_cpum_sf.c
+++ b/arch/s390/kernel/perf_cpum_sf.c
@@ -1504,37 +1504,28 @@ static void cpumf_measurement_alert(struct ext_code ext_code,
                sf_disable();
        }
 }
-
-static int cpumf_pmu_notifier(struct notifier_block *self,
-                             unsigned long action, void *hcpu)
+static int cpusf_pmu_setup(unsigned int cpu, int flags)
 {
-       int flags;
-
        /* Ignore the notification if no events are scheduled on the PMU.
         * This might be racy...
         */
        if (!atomic_read(&num_events))
-               return NOTIFY_OK;
-
-       switch (action & ~CPU_TASKS_FROZEN) {
-       case CPU_ONLINE:
-       case CPU_DOWN_FAILED:
-               flags = PMC_INIT;
-               local_irq_disable();
-               setup_pmc_cpu(&flags);
-               local_irq_enable();
-               break;
-       case CPU_DOWN_PREPARE:
-               flags = PMC_RELEASE;
-               local_irq_disable();
-               setup_pmc_cpu(&flags);
-               local_irq_enable();
-               break;
-       default:
-               break;
-       }
+               return 0;
 
-       return NOTIFY_OK;
+       local_irq_disable();
+       setup_pmc_cpu(&flags);
+       local_irq_enable();
+       return 0;
+}
+
+static int s390_pmu_sf_online_cpu(unsigned int cpu)
+{
+       return cpusf_pmu_setup(cpu, PMC_INIT);
+}
+
+static int s390_pmu_sf_offline_cpu(unsigned int cpu)
+{
+       return cpusf_pmu_setup(cpu, PMC_RELEASE);
 }
 
 static int param_get_sfb_size(char *buffer, const struct kernel_param *kp)
@@ -1634,7 +1625,9 @@ static int __init init_cpum_sampling_pmu(void)
                                        cpumf_measurement_alert);
                goto out;
        }
-       perf_cpu_notifier(cpumf_pmu_notifier);
+
+       cpuhp_setup_state(CPUHP_AP_PERF_S390_SF_ONLINE, "AP_PERF_S390_SF_ONLINE",
+                         s390_pmu_sf_online_cpu, s390_pmu_sf_offline_cpu);
 out:
        return err;
 }