From: Jack Steiner Date: Mon, 10 Jan 2011 19:52:11 +0000 (-0600) Subject: x86, UV: Fix APICID shift for Westmere processors X-Git-Tag: v2.6.38-rc1~3^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=990a32d1e54b3c0f7304bec95fb883404589b3f0;p=platform%2Fkernel%2Flinux-3.10.git 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 LKML-Reference: <20110110195210.GA18737@sgi.com> Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 2a3f2a7..f4f9e95 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); } /*