Skip to content

Commit

Permalink
[PATCH] sanitize sections for sparc32 smp
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Feb 2, 2007
1 parent 472ba91 commit b4cff84
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions arch/sparc/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc/kernel/sun4d_smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b4cff84

Please sign in to comment.