From: Paul Gortmaker Date: Mon, 13 Jan 2014 15:02:28 +0000 (+0100) Subject: s390: delete new instances of __cpuinit usage X-Git-Tag: firefly_0821_release~176^2~4660^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=28aa39b853fc889e672b73f69ce591d15e6306b0;p=firefly-linux-kernel-4.4.55.git s390: delete new instances of __cpuinit usage The patch "s390/perf: add support for the CPU-Measurement Sampling Facility" added a new instance of the __cpuinit macro usage. We removed this a couple versions ago; we now want to remove the compat no-op stubs. Introducing new users is not what we want to see at this point in time, as it will break once the stubs are gone. Cc: Hendrik Brueckner Signed-off-by: Paul Gortmaker Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c index 3c3bc8d7b220..6c0d29827cb6 100644 --- a/arch/s390/kernel/perf_cpum_sf.c +++ b/arch/s390/kernel/perf_cpum_sf.c @@ -1512,8 +1512,8 @@ static void cpumf_measurement_alert(struct ext_code ext_code, } } -static int __cpuinit cpumf_pmu_notifier(struct notifier_block *self, - unsigned long action, void *hcpu) +static int cpumf_pmu_notifier(struct notifier_block *self, + unsigned long action, void *hcpu) { unsigned int cpu = (long) hcpu; int flags;