aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Steiner <steiner@sgi.com>2009-07-27 09:38:08 -0500
committerIngo Molnar <mingo@elte.hu>2009-08-04 16:19:14 +0200
commit67e83f309ed0baaf01a2c956b5174905bcdc1242 (patch)
treed25f2729de27d4d3966ce0ecf7978f3483d664df
parentcc5e4fa1bd4d2f56da07f9092281afdcd2374ab9 (diff)
downloadkernel_samsung_aries-67e83f309ed0baaf01a2c956b5174905bcdc1242.zip
kernel_samsung_aries-67e83f309ed0baaf01a2c956b5174905bcdc1242.tar.gz
kernel_samsung_aries-67e83f309ed0baaf01a2c956b5174905bcdc1242.tar.bz2
x86, UV: Fix macros for accessing large node numbers
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>
-rw-r--r--arch/x86/include/asm/uv/uv_hub.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index a6dde05..77a6850 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -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