Commit b4cff846 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 472ba91d
...@@ -292,8 +292,8 @@ int setup_profiling_timer(unsigned int multiplier) ...@@ -292,8 +292,8 @@ int setup_profiling_timer(unsigned int multiplier)
void __init smp_prepare_cpus(unsigned int max_cpus) void __init smp_prepare_cpus(unsigned int max_cpus)
{ {
extern void smp4m_boot_cpus(void); extern void __init smp4m_boot_cpus(void);
extern void smp4d_boot_cpus(void); extern void __init smp4d_boot_cpus(void);
int i, cpuid, extra; int i, cpuid, extra;
printk("Entering SMP Mode...\n"); printk("Entering SMP Mode...\n");
...@@ -375,8 +375,8 @@ void __init smp_prepare_boot_cpu(void) ...@@ -375,8 +375,8 @@ void __init smp_prepare_boot_cpu(void)
int __cpuinit __cpu_up(unsigned int cpu) int __cpuinit __cpu_up(unsigned int cpu)
{ {
extern int smp4m_boot_one_cpu(int); extern int __cpuinit smp4m_boot_one_cpu(int);
extern int smp4d_boot_one_cpu(int); extern int __cpuinit smp4d_boot_one_cpu(int);
int ret=0; int ret=0;
switch(sparc_cpu_model) { switch(sparc_cpu_model) {
......
...@@ -164,7 +164,7 @@ void __init smp4d_boot_cpus(void) ...@@ -164,7 +164,7 @@ void __init smp4d_boot_cpus(void)
local_flush_cache_all(); 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; extern unsigned long sun4d_cpu_startup;
unsigned long *entry = &sun4d_cpu_startup; unsigned long *entry = &sun4d_cpu_startup;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment