---

yaml --- r: 61923 b: refs/heads/master c: d046943 h: refs/heads/master i: 61921: 4696f5a 61919: 4f84390 v: v3
git-mirror · Jul 20, 2007 · 3f11616 · 3f11616
1 parent bdf9a81
commit 3f11616
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);