From 94afc903e61a116979dc21df7daeadc709cf111d Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Tue, 25 Aug 2009 13:44:44 -0700
Subject: [PATCH] --- yaml --- r: 157156 b: refs/heads/master c:
 295594e9cf6ae2efd73371777aa8feba0f87f42f h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/arch/x86/kernel/apic/probe_64.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c51788df3b6e..8628491cb7d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7adb4df410966dfe43e4815256e3215110648fb8
+refs/heads/master: 295594e9cf6ae2efd73371777aa8feba0f87f42f
diff --git a/trunk/arch/x86/kernel/apic/probe_64.c b/trunk/arch/x86/kernel/apic/probe_64.c
index bc3e880f9b82..fcec2f1d34a1 100644
--- a/trunk/arch/x86/kernel/apic/probe_64.c
+++ b/trunk/arch/x86/kernel/apic/probe_64.c
@@ -44,6 +44,11 @@ static struct apic *apic_probe[] __initdata = {
 	NULL,
 };
 
+static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
+{
+	return hard_smp_processor_id() >> index_msb;
+}
+
 /*
  * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
  */
@@ -69,6 +74,11 @@ void __init default_setup_apic_routing(void)
 		printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
 	}
 
+	if (is_vsmp_box()) {
+		/* need to update phys_pkg_id */
+		apic->phys_pkg_id = apicid_phys_pkg_id;
+	}
+
 	/*
 	 * Now that apic routing model is selected, configure the
 	 * fault handling for intr remapping.