From a3153b59d7f826129b04c6966128856709637263 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 12 Aug 2008 15:08:51 -0700
Subject: [PATCH] --- yaml --- r: 108251 b: refs/heads/master c:
 6a4ad39b3de60ad0e75a78098be0f0eb1722b753 h: refs/heads/master i:   108249:
 e28dfd9af10560e0940777b6927eb69777d46390   108247:
 002f2d60498886041987277b0631c10a2f019165 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/misc/sgi-gru/grutables.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 82640f31e230..32aee282ea24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 969830b2fedf8336c41d6195f49d250b1e166ff8
+refs/heads/master: 6a4ad39b3de60ad0e75a78098be0f0eb1722b753
diff --git a/trunk/drivers/misc/sgi-gru/grutables.h b/trunk/drivers/misc/sgi-gru/grutables.h
index 4251018f70ff..a78f70deeb59 100644
--- a/trunk/drivers/misc/sgi-gru/grutables.h
+++ b/trunk/drivers/misc/sgi-gru/grutables.h
@@ -279,7 +279,7 @@ struct gru_stats_s {
 #if defined CONFIG_IA64
 #define VADDR_HI_BIT		64
 #define GRUREGION(addr)		((addr) >> (VADDR_HI_BIT - 3) & 3)
-#elif defined __x86_64
+#elif defined CONFIG_X86_64
 #define VADDR_HI_BIT		48
 #define GRUREGION(addr)		(0)		/* ZZZ could do better */
 #else