2 files changed, 2 insertions, 8 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b83389145f2..5d0e26a5c34 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -52,7 +52,7 @@ config ACPI_PROCFS
         depends on PROC_FS
         ---help---
           For backwards compatibility, this option allows
-          depricated /proc/acpi/ files to exist, even when
+          deprecated /proc/acpi/ files to exist, even when
           they have been replaced by functions in /sys.
           The deprecated files (and their replacements) include:
 
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index a7351084f2f..235a51e328c 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,
         return 0;
 }
 
-#ifdef CONFIG_IA64
-#define arch_cpu_to_apicid      ia64_cpu_to_sapicid
-#else
-#define arch_cpu_to_apicid      x86_cpu_to_apicid
-#endif
-
 static int map_madt_entry(u32 acpi_id)
 {
         unsigned long madt_end, entry;
@@ -501,7 +495,7 @@ static int get_cpu_id(acpi_handle handle, u32 acpi_id)
                 return apic_id;
 
         for (i = 0; i < NR_CPUS; ++i) {
-                if (arch_cpu_to_apicid[i] == apic_id)
+                if (cpu_physical_id(i) == apic_id)
                         return i;
         }
         return -1;