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