aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/smp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/kernel/smp.c')
-rw-r--r--arch/sparc/kernel/smp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c
index d0ccb8ad1d54..6135d4faeeeb 100644
--- a/arch/sparc/kernel/smp.c
+++ b/arch/sparc/kernel/smp.c
@@ -58,7 +58,7 @@ cpumask_t smp_commenced_mask = CPU_MASK_NONE;
58/* Used to make bitops atomic */ 58/* Used to make bitops atomic */
59unsigned char bitops_spinlock = 0; 59unsigned char bitops_spinlock = 0;
60 60
61void __init smp_store_cpu_info(int id) 61void __cpuinit smp_store_cpu_info(int id)
62{ 62{
63 int cpu_node; 63 int cpu_node;
64 64
@@ -304,7 +304,7 @@ void __init smp_setup_cpu_possible_map(void)
304 } 304 }
305} 305}
306 306
307void __devinit smp_prepare_boot_cpu(void) 307void __init smp_prepare_boot_cpu(void)
308{ 308{
309 int cpuid = hard_smp_processor_id(); 309 int cpuid = hard_smp_processor_id();
310 310
@@ -320,7 +320,7 @@ void __devinit smp_prepare_boot_cpu(void)
320 cpu_set(cpuid, phys_cpu_present_map); 320 cpu_set(cpuid, phys_cpu_present_map);
321} 321}
322 322
323int __devinit __cpu_up(unsigned int cpu) 323int __cpuinit __cpu_up(unsigned int cpu)
324{ 324{
325 extern int smp4m_boot_one_cpu(int); 325 extern int smp4m_boot_one_cpu(int);
326 int ret; 326 int ret;