From 7b51ff961a27134d514239ae5e6ef9add1b41d87 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Tue, 7 Dec 2010 00:55:29 -0800
Subject: [PATCH] --- yaml --- r: 227327 b: refs/heads/master c:
 f1157141636848f52c5f74040bed0ba355cf59b7 h: refs/heads/master i:   227325:
 d3d4b4ea480550e05e0365a36367a5c54c26a5e3   227323:
 80bf6348a611dc3d85ba74ae5c398ec990be2f24   227319:
 35b6b1edf323006ecc1b1d6487c4854ca97834a6   227311:
 0f18d8dcaf5cce4a33f03cd53a92532edc313d0c   227295:
 31481fdc28e456c558640ae3d533025304851bf5   227263:
 abd7d79717b09cfaaeea14ea38759b56ea214982   227199:
 c5d96f23dbd409c529d9a8710b8975b6163c22cb   227071:
 dc3b82e1c6c1a5b11809d1fa965586c94cc1fbf1   226815:
 33187837973f28183a39e0a4b9b85cd8f6825447   226303:
 ef7f6b3136573a35c6e17a0c3d6efe66c1e3068b   225279:
 0c33c8976083d945b4f0c17d93a26f800aa411fb v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/include/asm/apic.h  |  1 -
 trunk/arch/x86/kernel/apic/apic.c  | 24 ++----------------------
 trunk/arch/x86/kernel/mpparse.c    |  8 ++------
 trunk/arch/x86/mm/amdtopology_64.c |  1 -
 5 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index 224fa94e4354..7ba918af7506 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0104d38a740b25662c592c71f6907676510289c
+refs/heads/master: f1157141636848f52c5f74040bed0ba355cf59b7
diff --git a/trunk/arch/x86/include/asm/apic.h b/trunk/arch/x86/include/asm/apic.h
index 1cc42cfa1372..5e3969c36d7f 100644
--- a/trunk/arch/x86/include/asm/apic.h
+++ b/trunk/arch/x86/include/asm/apic.h
@@ -245,7 +245,6 @@ extern int apic_force_enable(void);
  * On 32bit this is mach-xxx local
  */
 #ifdef CONFIG_X86_64
-extern void early_init_lapic_mapping(void);
 extern int apic_is_clustered_box(void);
 #else
 static inline int apic_is_clustered_box(void)
diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c
index c02bf135de9d..f507f311d44d 100644
--- a/trunk/arch/x86/kernel/apic/apic.c
+++ b/trunk/arch/x86/kernel/apic/apic.c
@@ -1630,28 +1630,6 @@ static int __init detect_init_APIC(void)
 }
 #endif
 
-#ifdef CONFIG_X86_64
-void __init early_init_lapic_mapping(void)
-{
-	/*
-	 * If no local APIC can be found then go out
-	 * : it means there is no mpatable and MADT
-	 */
-	if (!smp_found_config)
-		return;
-
-	set_fixmap_nocache(FIX_APIC_BASE, mp_lapic_addr);
-	apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
-		    APIC_BASE, mp_lapic_addr);
-
-	/*
-	 * Fetch the APIC ID of the BSP in case we have a
-	 * default configuration (or the MP table is broken).
-	 */
-	boot_cpu_physical_apicid = read_apic_id();
-}
-#endif
-
 /**
  * init_apic_mappings - initialize APIC mappings
  */
@@ -1707,6 +1685,8 @@ void __init register_lapic_address(unsigned long address)
 	mp_lapic_addr = address;
 
 	set_fixmap_nocache(FIX_APIC_BASE, address);
+	apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
+		    APIC_BASE, mp_lapic_addr);
 	if (boot_cpu_physical_apicid == -1U) {
 		boot_cpu_physical_apicid  = read_apic_id();
 		apic_version[boot_cpu_physical_apicid] =
diff --git a/trunk/arch/x86/kernel/mpparse.c b/trunk/arch/x86/kernel/mpparse.c
index db0b70317949..27ccb7075342 100644
--- a/trunk/arch/x86/kernel/mpparse.c
+++ b/trunk/arch/x86/kernel/mpparse.c
@@ -289,17 +289,13 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
 #ifdef CONFIG_X86_32
 	generic_mps_oem_check(mpc, oem, str);
 #endif
-	/* save the local APIC address, it might be non-default */
+	/* Initialize the lapic mapping */
 	if (!acpi_lapic)
-		mp_lapic_addr = mpc->lapic;
+		register_lapic_address(mpc->lapic);
 
 	if (early)
 		return 1;
 
-	/* Initialize the lapic mapping */
-	if (!acpi_lapic)
-		register_lapic_address(mpc->lapic);
-
 	if (mpc->oemptr)
 		x86_init.mpparse.smp_read_mpc_oem(mpc);
 
diff --git a/trunk/arch/x86/mm/amdtopology_64.c b/trunk/arch/x86/mm/amdtopology_64.c
index 51fae9cfdecb..08a0069b87a5 100644
--- a/trunk/arch/x86/mm/amdtopology_64.c
+++ b/trunk/arch/x86/mm/amdtopology_64.c
@@ -66,7 +66,6 @@ static __init void early_get_boot_cpu_id(void)
 	if (smp_found_config)
 		early_get_smp_config();
 #endif
-	early_init_lapic_mapping();
 }
 
 int __init amd_get_nodes(struct bootnode *physnodes)