[Patch 10/29] GRU - Support 64-bit GRU addresses

[steiner@sgi.com]

[-- Attachment #1: uv_gru_vaddr_msb --]
[-- Type: text/plain, Size: 1118 bytes --]

From: Jack Steiner <steiner@sgi.com>

Increase the maximum address supported by the SGI GRU
driver to a full 64 bits. Note that GRU addresses are not
always the same as socket virtual addresses. Sockets may not
necessarily support the full 64 bits.

Signed-off-by: Jack Steiner <steiner@sgi.com>

---
 drivers/misc/sgi-gru/grutables.h |    6 ------
 1 file changed, 6 deletions(-)

Index: linux/drivers/misc/sgi-gru/grutables.h
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grutables.h	2009-11-20 09:32:29.000000000 -0600
+++ linux/drivers/misc/sgi-gru/grutables.h	2009-11-20 09:32:31.000000000 -0600
@@ -293,13 +293,7 @@ extern struct mcs_op_statistic mcs_op_st
 #define ASID_INC	8	/* number of regions */
 
 /* Generate a GRU asid value from a GRU base asid & a virtual address. */
-#if defined CONFIG_IA64
 #define VADDR_HI_BIT		64
-#elif defined CONFIG_X86_64
-#define VADDR_HI_BIT		48
-#else
-#error "Unsupported architecture"
-#endif
 #define GRUREGION(addr)		((addr) >> (VADDR_HI_BIT - 3) & 3)
 #define GRUASID(asid, addr)	((asid) + GRUREGION(addr))