aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/processor_core.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 9f11dc296cdd..fd48110f084e 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -421,12 +421,6 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
421 return 0; 421 return 0;
422} 422}
423 423
424#ifdef CONFIG_IA64
425#define arch_cpu_to_apicid ia64_cpu_to_sapicid
426#else
427#define arch_cpu_to_apicid x86_cpu_to_apicid
428#endif
429
430static int map_madt_entry(u32 acpi_id) 424static int map_madt_entry(u32 acpi_id)
431{ 425{
432 unsigned long madt_end, entry; 426 unsigned long madt_end, entry;
@@ -500,7 +494,7 @@ static int get_cpu_id(acpi_handle handle, u32 acpi_id)
500 return apic_id; 494 return apic_id;
501 495
502 for (i = 0; i < NR_CPUS; ++i) { 496 for (i = 0; i < NR_CPUS; ++i) {
503 if (arch_cpu_to_apicid[i] == apic_id) 497 if (cpu_physical_id(i) == apic_id)
504 return i; 498 return i;
505 } 499 }
506 return -1; 500 return -1;