aboutsummaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorPaul Gortmaker2014-01-13 16:02:28 +0100
committerMartin Schwidefsky2014-01-13 16:50:25 +0100
commit28aa39b853fc889e672b73f69ce591d15e6306b0 (patch)
treee4610782e9607624c18129e615ec2f53be244bc7 /arch/s390
parent075dfd82102d2048e43e1cbf48d558d915c50072 (diff)
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 <brueckner@linux.vnet.ibm.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/perf_cpum_sf.c4
1 files changed, 2 insertions, 2 deletions
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;