From 2fbbcb109816e05c104ba55690ab14ee4ade9c82 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 9 Feb 2007 16:38:55 +0000
Subject: [PATCH] --- yaml --- r: 47257 b: refs/heads/master c:
 f2e97df669d32f74152336f46e4e0e328b993c57 h: refs/heads/master i:   47255:
 f68659dd237b6555ab190bbadd24619bad62435c v: v3

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

diff --git a/[refs] b/[refs]
index f3320cb93cab..d02bec5cbac1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a5ab4157b3933d4fa29a1612879ab08f681041a
+refs/heads/master: f2e97df669d32f74152336f46e4e0e328b993c57
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 00c314aedab7..063799ea6be0 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -70,7 +70,7 @@ struct vm_area_struct;
 #ifdef CONFIG_NUMA
 #define GFP_THISNODE	(__GFP_THISNODE | __GFP_NOWARN | __GFP_NORETRY)
 #else
-#define GFP_THISNODE	0
+#define GFP_THISNODE	((__force gfp_t)0)
 #endif