summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup_percpu.c
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2009-01-27 04:56:48 +0100
committerTejun Heo <tj@kernel.org>2009-01-27 04:56:48 +0100
commit2697fbd5faf19c84c17441b1752bdcbdcfd1248c (patch)
tree70bdf58fba94bf9ff94b2b6372662da89add9723 /arch/x86/kernel/setup_percpu.c
parentx86: remove extra barriers from load_gs_base() (diff)
downloadlinux-2697fbd5faf19c84c17441b1752bdcbdcfd1248c.tar.xz
linux-2697fbd5faf19c84c17441b1752bdcbdcfd1248c.zip
x86: load new GDT after setting up boot cpu per-cpu area
Impact: sync 32 and 64-bit code Merge load_gs_base() into switch_to_new_gdt(). Load the GDT and per-cpu state for the boot cpu when its new area is set up. Signed-off-by: Brian Gerst <brgerst@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/kernel/setup_percpu.c')
-rw-r--r--arch/x86/kernel/setup_percpu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index bcca3a7b3748..4caa78d7cb15 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -113,13 +113,13 @@ void __init setup_per_cpu_areas(void)
per_cpu(x86_cpu_to_node_map, cpu) =
early_per_cpu_map(x86_cpu_to_node_map, cpu);
#endif
+#endif
/*
* Up to this point, the boot CPU has been using .data.init
- * area. Reload %gs offset for the boot CPU.
+ * area. Reload any changed state for the boot CPU.
*/
if (cpu == boot_cpu_id)
- load_gs_base(cpu);
-#endif
+ switch_to_new_gdt();
DBG("PERCPU: cpu %4d %p\n", cpu, ptr);
}