diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 17:50:57 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 17:50:57 -0500 |
commit | 9b7ed8faa034fc2d350e2eff5c68680eb5c43a07 (patch) | |
tree | 5c94c34ad30e312604c1ce4f08ab6631b64a94f5 /arch/x86/mach-voyager/voyager_smp.c | |
parent | 6522869c34664dd5f05a0a327e93915b1281c90d (diff) | |
parent | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (diff) |
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'arch/x86/mach-voyager/voyager_smp.c')
-rw-r--r-- | arch/x86/mach-voyager/voyager_smp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c index 9840b7ec749a..331cd6d56483 100644 --- a/arch/x86/mach-voyager/voyager_smp.c +++ b/arch/x86/mach-voyager/voyager_smp.c | |||
@@ -402,7 +402,7 @@ void __init find_smp_config(void) | |||
402 | VOYAGER_SUS_IN_CONTROL_PORT); | 402 | VOYAGER_SUS_IN_CONTROL_PORT); |
403 | 403 | ||
404 | current_thread_info()->cpu = boot_cpu_id; | 404 | current_thread_info()->cpu = boot_cpu_id; |
405 | x86_write_percpu(cpu_number, boot_cpu_id); | 405 | percpu_write(cpu_number, boot_cpu_id); |
406 | } | 406 | } |
407 | 407 | ||
408 | /* | 408 | /* |
@@ -530,7 +530,6 @@ static void __init do_boot_cpu(__u8 cpu) | |||
530 | /* init_tasks (in sched.c) is indexed logically */ | 530 | /* init_tasks (in sched.c) is indexed logically */ |
531 | stack_start.sp = (void *)idle->thread.sp; | 531 | stack_start.sp = (void *)idle->thread.sp; |
532 | 532 | ||
533 | init_gdt(cpu); | ||
534 | per_cpu(current_task, cpu) = idle; | 533 | per_cpu(current_task, cpu) = idle; |
535 | early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu); | 534 | early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu); |
536 | irq_ctx_init(cpu); | 535 | irq_ctx_init(cpu); |
@@ -1747,7 +1746,6 @@ static void __init voyager_smp_prepare_cpus(unsigned int max_cpus) | |||
1747 | 1746 | ||
1748 | static void __cpuinit voyager_smp_prepare_boot_cpu(void) | 1747 | static void __cpuinit voyager_smp_prepare_boot_cpu(void) |
1749 | { | 1748 | { |
1750 | init_gdt(smp_processor_id()); | ||
1751 | switch_to_new_gdt(); | 1749 | switch_to_new_gdt(); |
1752 | 1750 | ||
1753 | cpu_set(smp_processor_id(), cpu_online_map); | 1751 | cpu_set(smp_processor_id(), cpu_online_map); |
@@ -1780,7 +1778,6 @@ static void __init voyager_smp_cpus_done(unsigned int max_cpus) | |||
1780 | void __init smp_setup_processor_id(void) | 1778 | void __init smp_setup_processor_id(void) |
1781 | { | 1779 | { |
1782 | current_thread_info()->cpu = hard_smp_processor_id(); | 1780 | current_thread_info()->cpu = hard_smp_processor_id(); |
1783 | x86_write_percpu(cpu_number, hard_smp_processor_id()); | ||
1784 | } | 1781 | } |
1785 | 1782 | ||
1786 | static void voyager_send_call_func(cpumask_t callmask) | 1783 | static void voyager_send_call_func(cpumask_t callmask) |