summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJack Steiner2009-07-27 16:38:08 +0200
committerIngo Molnar2009-08-04 16:19:14 +0200
commit67e83f309ed0baaf01a2c956b5174905bcdc1242 (patch)
treed25f2729de27d4d3966ce0ecf7978f3483d664df /arch
parentx86, UV: Delete mapping of MMR rangs mapped by BIOS (diff)
downloadkernel-qcow2-linux-67e83f309ed0baaf01a2c956b5174905bcdc1242.tar.gz
kernel-qcow2-linux-67e83f309ed0baaf01a2c956b5174905bcdc1242.tar.xz
kernel-qcow2-linux-67e83f309ed0baaf01a2c956b5174905bcdc1242.zip
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>
Diffstat (limited to 'arch')
-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 a6dde059e02e..77a68505419a 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