diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-02-01 08:52:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-01 19:17:06 -0500 |
commit | b4cff8464b12b71fd6573c9b9dd762d2d390ef6c (patch) | |
tree | 7f7e5e668697c1c6088505c5a62a1e0e478be83a | |
parent | 472ba91dd9ce76b586d4d513f7e3448330eec7eb (diff) |
[PATCH] 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.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/sparc/kernel/smp.c | 8 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4d_smp.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c index 276f22881d0f..6b5f26b0fb75 100644 --- a/arch/sparc/kernel/smp.c +++ b/arch/sparc/kernel/smp.c | |||
@@ -292,8 +292,8 @@ int setup_profiling_timer(unsigned int multiplier) | |||
292 | 292 | ||
293 | void __init smp_prepare_cpus(unsigned int max_cpus) | 293 | void __init smp_prepare_cpus(unsigned int max_cpus) |
294 | { | 294 | { |
295 | extern void smp4m_boot_cpus(void); | 295 | extern void __init smp4m_boot_cpus(void); |
296 | extern void smp4d_boot_cpus(void); | 296 | extern void __init smp4d_boot_cpus(void); |
297 | int i, cpuid, extra; | 297 | int i, cpuid, extra; |
298 | 298 | ||
299 | printk("Entering SMP Mode...\n"); | 299 | printk("Entering SMP Mode...\n"); |
@@ -375,8 +375,8 @@ void __init smp_prepare_boot_cpu(void) | |||
375 | 375 | ||
376 | int __cpuinit __cpu_up(unsigned int cpu) | 376 | int __cpuinit __cpu_up(unsigned int cpu) |
377 | { | 377 | { |
378 | extern int smp4m_boot_one_cpu(int); | 378 | extern int __cpuinit smp4m_boot_one_cpu(int); |
379 | extern int smp4d_boot_one_cpu(int); | 379 | extern int __cpuinit smp4d_boot_one_cpu(int); |
380 | int ret=0; | 380 | int ret=0; |
381 | 381 | ||
382 | switch(sparc_cpu_model) { | 382 | switch(sparc_cpu_model) { |
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index c80ea61e8ba0..c69de5d4863d 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c | |||
@@ -164,7 +164,7 @@ void __init smp4d_boot_cpus(void) | |||
164 | local_flush_cache_all(); | 164 | local_flush_cache_all(); |
165 | } | 165 | } |
166 | 166 | ||
167 | int smp4d_boot_one_cpu(int i) | 167 | int __cpuinit smp4d_boot_one_cpu(int i) |
168 | { | 168 | { |
169 | extern unsigned long sun4d_cpu_startup; | 169 | extern unsigned long sun4d_cpu_startup; |
170 | unsigned long *entry = &sun4d_cpu_startup; | 170 | unsigned long *entry = &sun4d_cpu_startup; |