From: Andi Kleen <ak@suse.de>
Date: Mon, 12 Sep 2005 16:49:24 +0000 (+0200)
Subject: [PATCH] x86-64: Don't trust boot_cpu_id in the mptable.
X-Git-Tag: v2.6.14-rc1~66
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d3fbbf9fe8d5cd5f94256781cc69a4ac289a767;p=linux-2.6

[PATCH] x86-64: Don't trust boot_cpu_id in the mptable.

It could be wrong for kexec or other cases. Read it from
the CPU instead.

Signed-off-by: Murali <muralim@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index 12e9d6ca72..a759f4e745 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -622,8 +622,7 @@ void __init init_apic_mappings(void)
 	 * Fetch the APIC ID of the BSP in case we have a
 	 * default configuration (or the MP table is broken).
 	 */
-	if (boot_cpu_id == -1U)
-		boot_cpu_id = GET_APIC_ID(apic_read(APIC_ID));
+	boot_cpu_id = GET_APIC_ID(apic_read(APIC_ID));
 
 #ifdef CONFIG_X86_IO_APIC
 	{