Subject: [PATCH] x86, UV: Fix macros for accessing large node numbers

[Jack Steiner]

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@xxxxxxx>

---
 arch/x86/include/asm/uv/uv_hub.h |    2 +-
 arch/x86/kernel/apic/io_apic.c   |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Index: linux/arch/x86/include/asm/uv/uv_hub.h
===================================================================
--- linux.orig/arch/x86/include/asm/uv/uv_hub.h	2009-06-22 08:41:31.000000000 -0500
+++ linux/arch/x86/include/asm/uv/uv_hub.h	2009-06-22 10:10:14.000000000 -0500
@@ -175,7 +175,7 @@ DECLARE_PER_CPU(struct uv_hub_info_s, __
 #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
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/