From 62a6efe51c79983c96edc67e87dda09fec5a0b3d Mon Sep 17 00:00:00 2001 From: Jack Steiner Date: Tue, 15 Dec 2009 16:48:07 -0800 Subject: [PATCH] --- yaml --- r: 176731 b: refs/heads/master c: 6c9620c64be3920487c0533e0ab6724dad565d59 h: refs/heads/master i: 176729: 40bf7e05dbe6b0bf9b5122845fc19a46fe2e624e 176727: 351ef74607cc55850bad10ff9c17c4baf27096b0 v: v3 --- [refs] | 2 +- trunk/drivers/misc/sgi-gru/grutables.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8dc95a3b7082..e147be85185a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 648eb8e50200a09db2488623958d9cbd4b8aaf55 +refs/heads/master: 6c9620c64be3920487c0533e0ab6724dad565d59 diff --git a/trunk/drivers/misc/sgi-gru/grutables.h b/trunk/drivers/misc/sgi-gru/grutables.h index 676da7821992..f0c7308a36bb 100644 --- a/trunk/drivers/misc/sgi-gru/grutables.h +++ b/trunk/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))