Subject: [PATCH] x86, UV: Fix macros for accessing large node numbers
Subsystems (2)
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 <[email protected]>
--- arch/x86/include/asm/uv/uv_hub.h | 2 +- arch/x86/kernel/apic/io_apic.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
arch/x86/include/asm/uv/uv_hub.h +1 -1
@@ -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
[tip:x86/urgent] x86, UV: Fix macros for accessing large node numbers
Commit-ID: 67e83f309ed0baaf01a2c956b5174905bcdc1242 Gitweb: http://git.kernel.org/tip/67e83f309ed0baaf01a2c956b5174905bcdc1242 Author: Jack Steiner <[email protected]> AuthorDate: Mon, 27 Jul 2009 09:38:08 -0500 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Aug 2009 16:19:14 +0200
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 <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/include/asm/uv/uv_hub.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/include/asm/uv/uv_hub.h +1 -1
@@ -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