aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r--arch/x86/kernel/smpboot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 0c43e1f2e7d3..6cd002f3e20e 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -211,7 +211,7 @@ static void __cpuinit smp_callin(void)
211 /* 211 /*
212 * (This works even if the APIC is not enabled.) 212 * (This works even if the APIC is not enabled.)
213 */ 213 */
214 phys_id = GET_APIC_ID(read_apic_id()); 214 phys_id = read_apic_id();
215 cpuid = smp_processor_id(); 215 cpuid = smp_processor_id();
216 if (cpu_isset(cpuid, cpu_callin_map)) { 216 if (cpu_isset(cpuid, cpu_callin_map)) {
217 panic("%s: phys CPU#%d, CPU#%d already present??\n", __func__, 217 panic("%s: phys CPU#%d, CPU#%d already present??\n", __func__,
@@ -1157,9 +1157,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
1157 } 1157 }
1158 1158
1159 preempt_disable(); 1159 preempt_disable();
1160 if (GET_APIC_ID(read_apic_id()) != boot_cpu_physical_apicid) { 1160 if (read_apic_id() != boot_cpu_physical_apicid) {
1161 panic("Boot APIC ID in local APIC unexpected (%d vs %d)", 1161 panic("Boot APIC ID in local APIC unexpected (%d vs %d)",
1162 GET_APIC_ID(read_apic_id()), boot_cpu_physical_apicid); 1162 read_apic_id(), boot_cpu_physical_apicid);
1163 /* Or can we switch back to PIC here? */ 1163 /* Or can we switch back to PIC here? */
1164 } 1164 }
1165 preempt_enable(); 1165 preempt_enable();