diff options
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index f45d740b1b6a..5da35d2cdbd8 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -237,7 +237,7 @@ void __cpuinit smp_callin(void) | |||
237 | /* | 237 | /* |
238 | * (This works even if the APIC is not enabled.) | 238 | * (This works even if the APIC is not enabled.) |
239 | */ | 239 | */ |
240 | phys_id = GET_APIC_ID(apic_read(APIC_ID)); | 240 | phys_id = GET_APIC_ID(read_apic_id()); |
241 | cpuid = smp_processor_id(); | 241 | cpuid = smp_processor_id(); |
242 | if (cpu_isset(cpuid, cpu_callin_map)) { | 242 | if (cpu_isset(cpuid, cpu_callin_map)) { |
243 | panic("%s: phys CPU#%d, CPU#%d already present??\n", __func__, | 243 | panic("%s: phys CPU#%d, CPU#%d already present??\n", __func__, |
@@ -1205,9 +1205,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
1205 | return; | 1205 | return; |
1206 | } | 1206 | } |
1207 | 1207 | ||
1208 | if (GET_APIC_ID(apic_read(APIC_ID)) != boot_cpu_physical_apicid) { | 1208 | if (GET_APIC_ID(read_apic_id()) != boot_cpu_physical_apicid) { |
1209 | panic("Boot APIC ID in local APIC unexpected (%d vs %d)", | 1209 | panic("Boot APIC ID in local APIC unexpected (%d vs %d)", |
1210 | GET_APIC_ID(apic_read(APIC_ID)), boot_cpu_physical_apicid); | 1210 | GET_APIC_ID(read_apic_id()), boot_cpu_physical_apicid); |
1211 | /* Or can we switch back to PIC here? */ | 1211 | /* Or can we switch back to PIC here? */ |
1212 | } | 1212 | } |
1213 | 1213 | ||