From: Jack Steiner Change the name of GRU_GSEG_PAGESIZE to GRU_MIN_GSEG_PAGESIZE to more accurately reflect it's use. This is in preparation for allocating contexts using hugepages. Signed-off-by: Jack Steiner --- drivers/misc/sgi-gru/gru.h | 10 ++-------- drivers/misc/sgi-gru/gru_instructions.h | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) Index: linux/drivers/misc/sgi-gru/gru.h =================================================================== --- linux.orig/drivers/misc/sgi-gru/gru.h 2010-06-09 08:11:48.856038221 -0500 +++ linux/drivers/misc/sgi-gru/gru.h 2010-06-09 08:11:51.328084904 -0500 @@ -28,15 +28,9 @@ #define GRU_DS_BASE 0x20000 /* - * Size used to map GRU GSeg + * Minimum page size used to map a GRU context */ -#if defined(CONFIG_IA64) -#define GRU_GSEG_PAGESIZE (256 * 1024UL) -#elif defined(CONFIG_X86_64) -#define GRU_GSEG_PAGESIZE (256 * 1024UL) /* ZZZ 2MB ??? */ -#else -#error "Unsupported architecture" -#endif +#define GRU_MIN_GSEG_PAGESIZE (256 * 1024UL) /* * Statictics kept for each context. Index: linux/drivers/misc/sgi-gru/gru_instructions.h =================================================================== --- linux.orig/drivers/misc/sgi-gru/gru_instructions.h 2010-06-09 08:11:50.264036100 -0500 +++ linux/drivers/misc/sgi-gru/gru_instructions.h 2010-06-09 08:11:51.332083779 -0500 @@ -687,6 +687,6 @@ static inline void *gru_get_data_pointer */ static inline int gru_get_tri(void *vaddr) { - return ((unsigned long)vaddr & (GRU_GSEG_PAGESIZE - 1)) - GRU_DS_BASE; + return ((unsigned long)vaddr & (GRU_MIN_GSEG_PAGESIZE - 1)) - GRU_DS_BASE; } #endif /* __GRU_INSTRUCTIONS_H__ */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/