From 190ae17fbd1cbe92e6aa9076bd5e73ad1a30b99c Mon Sep 17 00:00:00 2001
From: Mike Travis <travis@sgi.com>
Date: Fri, 19 Oct 2007 20:35:03 +0200
Subject: [PATCH] --- yaml --- r: 71700 b: refs/heads/master c:
 71b31233a215be27e2efbcc0e739cbebb0bde078 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/mpparse_64.c  | 2 ++
 trunk/drivers/acpi/processor_core.c | 8 +-------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index dc1df3cc0869..1b0ad08fa40a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6278470b7cdbf2bf6ba7345130d83924451a51a
+refs/heads/master: 71b31233a215be27e2efbcc0e739cbebb0bde078
diff --git a/trunk/arch/x86/kernel/mpparse_64.c b/trunk/arch/x86/kernel/mpparse_64.c
index 4336c0fc3b81..ef4aab123581 100644
--- a/trunk/arch/x86/kernel/mpparse_64.c
+++ b/trunk/arch/x86/kernel/mpparse_64.c
@@ -57,6 +57,8 @@ unsigned long mp_lapic_addr = 0;
 
 /* Processor that is doing the boot up */
 unsigned int boot_cpu_id = -1U;
+EXPORT_SYMBOL(boot_cpu_id);
+
 /* Internal processor count */
 unsigned int num_processors __cpuinitdata = 0;
 
diff --git a/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c
index 9f11dc296cdd..fd48110f084e 100644
--- a/trunk/drivers/acpi/processor_core.c
+++ b/trunk/drivers/acpi/processor_core.c
@@ -421,12 +421,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;
@@ -500,7 +494,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;