From 2f8535c2e1b125f3f1fe12c3cb0a9ec9181a84c8 Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Fri, 27 Aug 2010 11:09:50 -0700
Subject: [PATCH] --- yaml --- r: 212095 b: refs/heads/master c:
 fa47f7e52874683a9659df2f1f143105f676dc0f h: refs/heads/master i:   212093:
 f5f1eafb2e915725b103474491db30048adbbae9   212091:
 02637252af143f7c790b62ee014af814d9c95554   212087:
 d63cfdd0fe1081c5f5feb5fb866deabd8488cb56   212079:
 734b2c673616a9aeb55d7a8cec46871741b4f65e   212063:
 7da5ab08ef297d490149b7ed5cf5a0706ee069cd   212031:
 ec08ebc390eb06b9702d876c5caaa04396feed1d   211967:
 16b897001e75feaa21e429be70f632cab302aa4a v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/kernel/apic/apic.c     | 3 ---
 trunk/arch/x86/kernel/apic/probe_64.c | 3 +++
 trunk/arch/x86/kernel/smpboot.c       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index eb8bf135bc21..1292d8da2caa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62a92f4c69cd1d9361ad8c16be1dd16e6821bc15
+refs/heads/master: fa47f7e52874683a9659df2f1f143105f676dc0f
diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c
index e3b534cda49a..8cf86fb3b4e3 100644
--- a/trunk/arch/x86/kernel/apic/apic.c
+++ b/trunk/arch/x86/kernel/apic/apic.c
@@ -1665,10 +1665,7 @@ int __init APIC_init_uniprocessor(void)
 	}
 #endif
 
-#ifndef CONFIG_SMP
-	enable_IR_x2apic();
 	default_setup_apic_routing();
-#endif
 
 	verify_local_APIC();
 	connect_bsp_APIC();
diff --git a/trunk/arch/x86/kernel/apic/probe_64.c b/trunk/arch/x86/kernel/apic/probe_64.c
index 83e9be4778e2..f9e4e6a54073 100644
--- a/trunk/arch/x86/kernel/apic/probe_64.c
+++ b/trunk/arch/x86/kernel/apic/probe_64.c
@@ -54,6 +54,9 @@ static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
  */
 void __init default_setup_apic_routing(void)
 {
+
+	enable_IR_x2apic();
+
 #ifdef CONFIG_X86_X2APIC
 	if (x2apic_mode
 #ifdef CONFIG_X86_UV
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index 8b3bfc4dd708..87a8c6b00f8d 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -1109,8 +1109,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
 	}
 	set_cpu_sibling_map(0);
 
-	enable_IR_x2apic();
-	default_setup_apic_routing();
 
 	if (smp_sanity_check(max_cpus) < 0) {
 		printk(KERN_INFO "SMP disabled\n");
@@ -1118,6 +1116,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
 		goto out;
 	}
 
+	default_setup_apic_routing();
+
 	preempt_disable();
 	if (read_apic_id() != boot_cpu_physical_apicid) {
 		panic("Boot APIC ID in local APIC unexpected (%d vs %d)",