aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/common.c
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2009-01-30 03:47:53 -0500
committerTejun Heo <tj@kernel.org>2009-01-31 00:28:50 -0500
commit552be871e67ff577ed36beb2f53d078b42304739 (patch)
treefa8a1160674f319db5c9dfe9360e22fb44ade300 /arch/x86/kernel/cpu/common.c
parent2749ebe320ff9f77548d10fcc0a3464ac21c8e58 (diff)
x86: pass in cpu number to switch_to_new_gdt()
Impact: cleanup, prepare for xen boot fix. Xen needs to call this function very early to setup the GDT and per-cpu segments. Remove the call to smp_processor_id() and just pass in the cpu number. Signed-off-by: Brian Gerst <brgerst@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
-rw-r--r--arch/x86/kernel/cpu/common.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 652fdc9a757a..6eacd64b602e 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -255,10 +255,9 @@ __u32 cleared_cpu_caps[NCAPINTS] __cpuinitdata;
255 255
256/* Current gdt points %fs at the "master" per-cpu area: after this, 256/* Current gdt points %fs at the "master" per-cpu area: after this,
257 * it's on the real one. */ 257 * it's on the real one. */
258void switch_to_new_gdt(void) 258void switch_to_new_gdt(int cpu)
259{ 259{
260 struct desc_ptr gdt_descr; 260 struct desc_ptr gdt_descr;
261 int cpu = smp_processor_id();
262 261
263 gdt_descr.address = (long)get_cpu_gdt_table(cpu); 262 gdt_descr.address = (long)get_cpu_gdt_table(cpu);
264 gdt_descr.size = GDT_SIZE - 1; 263 gdt_descr.size = GDT_SIZE - 1;
@@ -993,7 +992,7 @@ void __cpuinit cpu_init(void)
993 * and set up the GDT descriptor: 992 * and set up the GDT descriptor:
994 */ 993 */
995 994
996 switch_to_new_gdt(); 995 switch_to_new_gdt(cpu);
997 loadsegment(fs, 0); 996 loadsegment(fs, 0);
998 997
999 load_idt((const struct desc_ptr *)&idt_descr); 998 load_idt((const struct desc_ptr *)&idt_descr);
@@ -1098,7 +1097,7 @@ void __cpuinit cpu_init(void)
1098 clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE); 1097 clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
1099 1098
1100 load_idt(&idt_descr); 1099 load_idt(&idt_descr);
1101 switch_to_new_gdt(); 1100 switch_to_new_gdt(cpu);
1102 1101
1103 /* 1102 /*
1104 * Set up and load the per-CPU TSS and LDT 1103 * Set up and load the per-CPU TSS and LDT