]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
fix gfp_t annotations for slub
authorAl Viro <viro@ftp.linux.org.uk>
Fri, 20 Jul 2007 15:18:06 +0000 (16:18 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 20 Jul 2007 15:24:50 +0000 (08:24 -0700)
Since we have use like ~SLUB_DMA, we ought to have the type
set right in both cases.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/slub_def.h

index 07f7e4cbcee3bc375e893b3ecdccdad148905a2a..124270df8734eb2b20e3f36adb115bc356692a15 100644 (file)
@@ -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);