diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 12:16:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 12:16:59 +0100 |
| commit | eca217b36e5d7d4377493d5cedd89105e66a5a72 (patch) | |
| tree | 71f0ecd5225c3033d509b77a23ad7bc576cf0ab6 /arch/x86/kernel/smpboot.c | |
| parent | 54a353a0f845c1dad5fc8183872e750d667838ac (diff) | |
| parent | e4d0407185cdbdcfd99fc23bde2e5454bbc46329 (diff) | |
| download | blackbird-op-linux-eca217b36e5d7d4377493d5cedd89105e66a5a72.tar.gz blackbird-op-linux-eca217b36e5d7d4377493d5cedd89105e66a5a72.zip | |
Merge branch 'x86/paravirt' into x86/apic
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 96f7d304f5c9..af57f88186e7 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1188,7 +1188,7 @@ out: void __init native_smp_prepare_boot_cpu(void) { int me = smp_processor_id(); - switch_to_new_gdt(); + switch_to_new_gdt(me); /* already set me in cpu_online_mask in boot_cpu_init() */ cpumask_set_cpu(me, cpu_callout_mask); per_cpu(cpu_state, me) = CPU_ONLINE; |
