Skip to contentSkip to conversation

s390: delete new instances of __cpuinit usage

PATCH Applied Paul Gortmaker 2 participants 2 messages Jan 10, 2014 – Jan 13, 2014 s390

lore
Share & tools
lore

Paul Gortmaker

author
#0 lore raw

PATCH 1/1 s390: delete new instances of __cpuinit usage

Commit 8c069ff4bd6063a3f15e606c882e03f75c7e7711 ("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 <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Signed-off-by Paul Gortmaker <[email protected]>

---

[Patch based on today's linux-next tree, so if s390 next content
gets rebased, then the above commit ID will be invalidated; if it _does_ get rebased, then feel free to squash this fix into the orig.]

 arch/s390/kernel/perf_cpum_sf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/perf_cpum_sf.c +1 -1
index 3c3bc8d7b220..ce3a1d9c521b 100644
@@ -1512,7 +1512,7 @@ static void cpumf_measurement_alert(struct ext_code ext_code,
 	}
 }
 
-static int __cpuinit cpumf_pmu_notifier(struct notifier_block *self,
+static int cpumf_pmu_notifier(struct notifier_block *self,
 					unsigned long action, void *hcpu)
 {
 	unsigned int cpu = (long) hcpu;
Signature · 1 line
1.8.5.2
Applied
#1 lore raw
Quoted 26 lines · On Fri, 10 Jan 2014 10:00:50 -0500 Paul Gortmaker…

Commit 8c069ff4bd6063a3f15e606c882e03f75c7e7711 ("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 <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Signed-off-by Paul Gortmaker <[email protected]>

---

[Patch based on today's linux-next tree, so if s390 next content
gets rebased, then the above commit ID will be invalidated; if it _does_ get rebased, then feel free to squash this fix into the orig.]

 arch/s390/kernel/perf_cpum_sf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/perf_cpum_sf.c +0 -0
index 3c3bc8d7b220..ce3a1d9c521b 100644

arch/s390/kernel/perf_cpum_sf.c static void cpumf_measurement_alert(struct ext_code ext_code, · line 1518

Quoted 8 lines
arch/s390/kernel/perf_cpum_sf.c +1 -1
@@ -1512,7 +1512,7 @@ static void cpumf_measurement_alert(struct ext_code ext_code,
 	}
 }
 
-static int __cpuinit cpumf_pmu_notifier(struct notifier_block *self,
+static int cpumf_pmu_notifier(struct notifier_block *self,
 					unsigned long action, void *hcpu)
 {
 	unsigned int cpu = (long) hcpu;

Applied to linux-s390 for the next merge window. Thanks.

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.