aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/processor.h2
-rw-r--r--arch/x86/kernel/cpu/common.c7
-rw-r--r--arch/x86/kernel/setup_percpu.c2
-rw-r--r--arch/x86/kernel/smpboot.c2
-rw-r--r--arch/x86/mach-voyager/voyager_smp.c11
5 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index befa20b4a68c..1c25eb69ea86 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -768,7 +768,7 @@ extern int sysenter_setup(void);
768extern struct desc_ptr early_gdt_descr; 768extern struct desc_ptr early_gdt_descr;
769 769
770extern void cpu_set_gdt(int); 770extern void cpu_set_gdt(int);
771extern void switch_to_new_gdt(void); 771extern void switch_to_new_gdt(int);
772extern void cpu_init(void); 772extern void cpu_init(void);
773 773
774static inline unsigned long get_debugctlmsr(void) 774static inline unsigned long get_debugctlmsr(void)
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
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 0d1e7ac439f4..ef91747bbed5 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -122,7 +122,7 @@ void __init setup_per_cpu_areas(void)
122 * area. Reload any changed state for the boot CPU. 122 * area. Reload any changed state for the boot CPU.
123 */ 123 */
124 if (cpu == boot_cpu_id) 124 if (cpu == boot_cpu_id)
125 switch_to_new_gdt(); 125 switch_to_new_gdt(cpu);
126 126
127 DBG("PERCPU: cpu %4d %p\n", cpu, ptr); 127 DBG("PERCPU: cpu %4d %p\n", cpu, ptr);
128 } 128 }
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index f9dbcff43546..612d3c74f6a3 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1185,7 +1185,7 @@ out:
1185void __init native_smp_prepare_boot_cpu(void) 1185void __init native_smp_prepare_boot_cpu(void)
1186{ 1186{
1187 int me = smp_processor_id(); 1187 int me = smp_processor_id();
1188 switch_to_new_gdt(); 1188 switch_to_new_gdt(me);
1189 /* already set me in cpu_online_mask in boot_cpu_init() */ 1189 /* already set me in cpu_online_mask in boot_cpu_init() */
1190 cpumask_set_cpu(me, cpu_callout_mask); 1190 cpumask_set_cpu(me, cpu_callout_mask);
1191 per_cpu(cpu_state, me) = CPU_ONLINE; 1191 per_cpu(cpu_state, me) = CPU_ONLINE;
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
index 331cd6d56483..58c7cac3440d 100644
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@ -1746,12 +1746,13 @@ static void __init voyager_smp_prepare_cpus(unsigned int max_cpus)
1746 1746
1747static void __cpuinit voyager_smp_prepare_boot_cpu(void) 1747static void __cpuinit voyager_smp_prepare_boot_cpu(void)
1748{ 1748{
1749 switch_to_new_gdt(); 1749 int cpu = smp_processor_id();
1750 switch_to_new_gdt(cpu);
1750 1751
1751 cpu_set(smp_processor_id(), cpu_online_map); 1752 cpu_set(cpu, cpu_online_map);
1752 cpu_set(smp_processor_id(), cpu_callout_map); 1753 cpu_set(cpu, cpu_callout_map);
1753 cpu_set(smp_processor_id(), cpu_possible_map); 1754 cpu_set(cpu, cpu_possible_map);
1754 cpu_set(smp_processor_id(), cpu_present_map); 1755 cpu_set(cpu, cpu_present_map);
1755} 1756}
1756 1757
1757static int __cpuinit voyager_cpu_up(unsigned int cpu) 1758static int __cpuinit voyager_cpu_up(unsigned int cpu)