x86, UV: Fix macros for accessing large node numbers
authorJack Steiner <steiner@sgi.com>
Mon, 27 Jul 2009 14:38:08 +0000 (09:38 -0500)
committerIngo Molnar <mingo@elte.hu>
Tue, 4 Aug 2009 14:19:14 +0000 (16:19 +0200)
The UV chipset automatically supplies the upper bits on nodes
being referenced by MMR accesses. These bit can be deleted from
the hub addressing macros.

Signed-off-by: Jack Steiner <steiner@sgi.com>
LKML-Reference: <20090727143808.GA8076@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/uv/uv_hub.h

index a6dde059e02e554b2c696cf915b53c96b5738b7e..77a68505419a5e3a8c7a0c2a7ae6f43b34f32541 100644 (file)
@@ -175,7 +175,7 @@ DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);
 #define UV_GLOBAL_MMR32_PNODE_BITS(p)  ((p) << (UV_GLOBAL_MMR32_PNODE_SHIFT))
 
 #define UV_GLOBAL_MMR64_PNODE_BITS(p)                                  \
-       ((unsigned long)(UV_PNODE_TO_GNODE(p)) << UV_GLOBAL_MMR64_PNODE_SHIFT)
+       (((unsigned long)(p)) << UV_GLOBAL_MMR64_PNODE_SHIFT)
 
 #define UV_APIC_PNODE_SHIFT    6