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);