diff options
Diffstat (limited to 'arch/sparc/kernel/smp_64.c')
| -rw-r--r-- | arch/sparc/kernel/smp_64.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c index 77539eda928c..e142545244f2 100644 --- a/arch/sparc/kernel/smp_64.c +++ b/arch/sparc/kernel/smp_64.c | |||
| @@ -87,7 +87,7 @@ extern void setup_sparc64_timer(void); | |||
| 87 | 87 | ||
| 88 | static volatile unsigned long callin_flag = 0; | 88 | static volatile unsigned long callin_flag = 0; |
| 89 | 89 | ||
| 90 | void __cpuinit smp_callin(void) | 90 | void smp_callin(void) |
| 91 | { | 91 | { |
| 92 | int cpuid = hard_smp_processor_id(); | 92 | int cpuid = hard_smp_processor_id(); |
| 93 | 93 | ||
| @@ -281,7 +281,8 @@ static unsigned long kimage_addr_to_ra(void *p) | |||
| 281 | return kern_base + (val - KERNBASE); | 281 | return kern_base + (val - KERNBASE); |
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg, void **descrp) | 284 | static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg, |
| 285 | void **descrp) | ||
| 285 | { | 286 | { |
| 286 | extern unsigned long sparc64_ttable_tl0; | 287 | extern unsigned long sparc64_ttable_tl0; |
| 287 | extern unsigned long kern_locked_tte_data; | 288 | extern unsigned long kern_locked_tte_data; |
| @@ -342,7 +343,7 @@ extern unsigned long sparc64_cpu_startup; | |||
| 342 | */ | 343 | */ |
| 343 | static struct thread_info *cpu_new_thread = NULL; | 344 | static struct thread_info *cpu_new_thread = NULL; |
| 344 | 345 | ||
| 345 | static int __cpuinit smp_boot_one_cpu(unsigned int cpu, struct task_struct *idle) | 346 | static int smp_boot_one_cpu(unsigned int cpu, struct task_struct *idle) |
| 346 | { | 347 | { |
| 347 | unsigned long entry = | 348 | unsigned long entry = |
| 348 | (unsigned long)(&sparc64_cpu_startup); | 349 | (unsigned long)(&sparc64_cpu_startup); |
| @@ -1266,7 +1267,7 @@ void smp_fill_in_sib_core_maps(void) | |||
| 1266 | } | 1267 | } |
| 1267 | } | 1268 | } |
| 1268 | 1269 | ||
| 1269 | int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle) | 1270 | int __cpu_up(unsigned int cpu, struct task_struct *tidle) |
| 1270 | { | 1271 | { |
| 1271 | int ret = smp_boot_one_cpu(cpu, tidle); | 1272 | int ret = smp_boot_one_cpu(cpu, tidle); |
| 1272 | 1273 | ||
