---

yaml --- r: 36151 b: refs/heads/master c: 77f700d h: refs/heads/master i: 36149: 0862d63 36147: f3e0af3 36143: 69af338 v: v3
git-mirror · Sep 27, 2006 · a2161c9 · a2161c9
1 parent c9c3947
commit a2161c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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 */