diff options
| author | Jack Steiner <steiner@sgi.com> | 2009-12-16 01:48:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 16:20:15 +0100 |
| commit | 6c9620c64be3920487c0533e0ab6724dad565d59 (patch) | |
| tree | 2e554d06b85b60dbc2e0386dd1114ed118d6d354 | |
| parent | gru: improve messages for malfunctioning GRUs (diff) | |
| download | linux-6c9620c64be3920487c0533e0ab6724dad565d59.tar.xz linux-6c9620c64be3920487c0533e0ab6724dad565d59.zip | |
gru: support 64-bit GRU addresses
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/misc/sgi-gru/grutables.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h index 676da7821992..f0c7308a36bb 100644 --- a/drivers/misc/sgi-gru/grutables.h +++ b/drivers/misc/sgi-gru/grutables.h @@ -293,13 +293,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last]; #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)) |