From a2161c9080de3b0b45d8f03823fa46052fae38bc Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 27 Sep 2006 01:50:07 -0700
Subject: [PATCH] --- yaml --- r: 36151 b: refs/heads/master c:
 77f700dab4c05f8ee17584ec869672796d7bcb87 h: refs/heads/master i:   36149:
 0862d630b34325ad79c3500b967587a4b1b3286f   36147:
 f3e0af3bbe446aaa7e63fb50874ee0923085d6ae   36143:
 69af338a5d1c5925afe2ed933bf4a8aaf9937ec9 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/gfp.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fc55e525f344..e2a1da6e8a26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08e0f6a9705376732fd3bc9bf8ba97a6b5211eb1
+refs/heads/master: 77f700dab4c05f8ee17584ec869672796d7bcb87
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 8b34aabfe4c6..bf2b6bc3f6fd 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -67,7 +67,12 @@ struct vm_area_struct;
 #define GFP_HIGHUSER	(__GFP_WAIT | __GFP_IO | __GFP_FS | __GFP_HARDWALL | \
 			 __GFP_HIGHMEM)
 
+#ifdef CONFIG_NUMA
 #define GFP_THISNODE	(__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY)
+#else
+#define GFP_THISNODE	0
+#endif
+
 
 /* Flag - indicates that the buffer will be suitable for DMA.  Ignored on some
    platforms, used as appropriate on others */