Skip to contentSkip to conversation

sanitize sections for sparc32 smp

PATCH New Al Viro 1 participant 1 message Feb 1, 2007 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 sanitize sections for sparc32 smp

a) sun4d_boot_one_cpu() should be __cpuinit (called only from __cpuinit __cpu_up(), for one thing, leads to calls of __cpuinit functions for another).
b) got externs in arch/sparc/kernel/smp.c to match reality.

---
 arch/sparc/kernel/smp.c       |    8 ++++----
 arch/sparc/kernel/sun4d_smp.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
arch/sparc/kernel/smp.c +4 -4
index 276f228..6b5f26b 100644
@@ -292,8 +292,8 @@ int setup_profiling_timer(unsigned int multiplier)
 
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
-	extern void smp4m_boot_cpus(void);
-	extern void smp4d_boot_cpus(void);
+	extern void __init smp4m_boot_cpus(void);
+	extern void __init smp4d_boot_cpus(void);
 	int i, cpuid, extra;
 
 	printk("Entering SMP Mode...\n");
@@ -375,8 +375,8 @@ void __init smp_prepare_boot_cpu(void)
 
 int __cpuinit __cpu_up(unsigned int cpu)
 {
-	extern int smp4m_boot_one_cpu(int);
-	extern int smp4d_boot_one_cpu(int);
+	extern int __cpuinit smp4m_boot_one_cpu(int);
+	extern int __cpuinit smp4d_boot_one_cpu(int);
 	int ret=0;
 
 	switch(sparc_cpu_model) {
arch/sparc/kernel/sun4d_smp.c +1 -1
index c80ea61..c69de5d 100644
@@ -164,7 +164,7 @@ void __init smp4d_boot_cpus(void)
 	local_flush_cache_all();
 }
 
-int smp4d_boot_one_cpu(int i)
+int __cpuinit smp4d_boot_one_cpu(int i)
 {
 			extern unsigned long sun4d_cpu_startup;
 			unsigned long *entry = &sun4d_cpu_startup;
Signature · 1 line
1.5.0-rc2.GIT