summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJack Steiner <steiner@sgi.com>2011-01-10 22:52:11 +0300
committerIngo Molnar <mingo@elte.hu>2011-01-11 14:44:45 +0300
commit990a32d1e54b3c0f7304bec95fb883404589b3f0 (patch)
treef9d1d6b7f4b7b1f4a380bc3612920202cddb734c /arch
parent24d9b70b8c679264756a6980e668b96b3f964826 (diff)
downloadlinux-990a32d1e54b3c0f7304bec95fb883404589b3f0.tar.xz
x86, UV: Fix APICID shift for Westmere processors
Westmere processors use a different algorithm for assigning APICIDs on SGI UV systems. The location of the node number within the apicid is now a function of the processor type. Signed-off-by: Jack Steiner <steiner@sgi.com> LKML-Reference: <20110110195210.GA18737@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/apic/x2apic_uv_x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 2a3f2a7db243..f4f9e95aa151 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -378,7 +378,7 @@ struct apic __refdata apic_x2apic_uv_x = {
static __cpuinit void set_x2apic_extra_bits(int pnode)
{
- __get_cpu_var(x2apic_extra_bits) = (pnode << 6);
+ __get_cpu_var(x2apic_extra_bits) = (pnode << uvh_apicid.s.pnode_shift);
}
/*