From d7f25acbabfec62a4055a33c26bfbbb3adb3eb23 Mon Sep 17 00:00:00 2001 From: Jack Steiner Date: Mon, 10 Jan 2011 13:52:11 -0600 Subject: [PATCH] --- yaml --- r: 228976 b: refs/heads/master c: 990a32d1e54b3c0f7304bec95fb883404589b3f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a31862b631e8..263f8ad38f2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24d9b70b8c679264756a6980e668b96b3f964826 +refs/heads/master: 990a32d1e54b3c0f7304bec95fb883404589b3f0 diff --git a/trunk/arch/x86/kernel/apic/x2apic_uv_x.c b/trunk/arch/x86/kernel/apic/x2apic_uv_x.c index 2a3f2a7db243..f4f9e95aa151 100644 --- a/trunk/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/trunk/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); } /*