From 3f1161627cb3fdb4eb7a1052abe0df01cccd3851 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 20 Jul 2007 16:18:06 +0100
Subject: [PATCH] --- yaml --- r: 61923 b: refs/heads/master c:
 d046943cbaf332f75284ad99f4b3e60bae7ffff2 h: refs/heads/master i:   61921:
 4696f5a9919c985a7ddf1ff8b2039c6a0b89e716   61919:
 4f84390fd1f143061766eee08f1127618f9cdf66 v: v3

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

diff --git a/[refs] b/[refs]
index 28cd9c6ae6b5..cca20dcb3d40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d4bc5b6b0ce030f51a2db836caeaf687b986791
+refs/heads/master: d046943cbaf332f75284ad99f4b3e60bae7ffff2
diff --git a/trunk/include/linux/slub_def.h b/trunk/include/linux/slub_def.h
index 07f7e4cbcee3..124270df8734 100644
--- a/trunk/include/linux/slub_def.h
+++ b/trunk/include/linux/slub_def.h
@@ -160,7 +160,7 @@ static inline struct kmem_cache *kmalloc_slab(size_t size)
 #define SLUB_DMA __GFP_DMA
 #else
 /* Disable DMA functionality */
-#define SLUB_DMA 0
+#define SLUB_DMA (__force gfp_t)0
 #endif
 
 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);