---

yaml --- r: 228976 b: refs/heads/master c: 990a32d h: refs/heads/master v: v3
git-mirror · Jan 11, 2011 · d7f25ac · d7f25ac
1 parent 6e3bb7f
commit d7f25ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     }
     /*
@@ Expand Down @@