diff options
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/smp.c | 6 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4m_smp.c | 9 |
2 files changed, 5 insertions, 10 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 */ |
59 | unsigned char bitops_spinlock = 0; | 59 | unsigned char bitops_spinlock = 0; |
60 | 60 | ||
61 | void __init smp_store_cpu_info(int id) | 61 | void __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 | ||
307 | void __devinit smp_prepare_boot_cpu(void) | 307 | void __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 | ||
323 | int __devinit __cpu_up(unsigned int cpu) | 323 | int __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; |
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 70b375a4c2c2..3b32096134aa 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
@@ -66,7 +66,7 @@ static inline unsigned long swap(volatile unsigned long *ptr, unsigned long val) | |||
66 | static void smp_setup_percpu_timer(void); | 66 | static void smp_setup_percpu_timer(void); |
67 | extern void cpu_probe(void); | 67 | extern void cpu_probe(void); |
68 | 68 | ||
69 | void __init smp4m_callin(void) | 69 | void __cpuinit smp4m_callin(void) |
70 | { | 70 | { |
71 | int cpuid = hard_smp_processor_id(); | 71 | int cpuid = hard_smp_processor_id(); |
72 | 72 | ||
@@ -112,13 +112,8 @@ void __init smp4m_callin(void) | |||
112 | local_irq_enable(); | 112 | local_irq_enable(); |
113 | 113 | ||
114 | cpu_set(cpuid, cpu_online_map); | 114 | cpu_set(cpuid, cpu_online_map); |
115 | /* last one in gets all the interrupts (for testing) */ | ||
116 | set_irq_udt(boot_cpu_id); | ||
117 | } | 115 | } |
118 | 116 | ||
119 | extern void init_IRQ(void); | ||
120 | extern void cpu_panic(void); | ||
121 | |||
122 | /* | 117 | /* |
123 | * Cycle through the processors asking the PROM to start each one. | 118 | * Cycle through the processors asking the PROM to start each one. |
124 | */ | 119 | */ |
@@ -134,7 +129,7 @@ void __init smp4m_boot_cpus(void) | |||
134 | local_flush_cache_all(); | 129 | local_flush_cache_all(); |
135 | } | 130 | } |
136 | 131 | ||
137 | int smp4m_boot_one_cpu(int i) | 132 | int __cpuinit smp4m_boot_one_cpu(int i) |
138 | { | 133 | { |
139 | extern unsigned long sun4m_cpu_startup; | 134 | extern unsigned long sun4m_cpu_startup; |
140 | unsigned long *entry = &sun4m_cpu_startup; | 135 | unsigned long *entry = &sun4m_cpu_startup; |