From: Al Viro Date: Fri, 20 Jul 2007 15:18:06 +0000 (+0100) Subject: fix gfp_t annotations for slub X-Git-Tag: v2.6.23-rc1~232 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d046943cbaf332f75284ad99f4b3e60bae7ffff2;p=~shefty%2Frdma-dev.git fix gfp_t annotations for slub Since we have use like ~SLUB_DMA, we ought to have the type set right in both cases. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds --- diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 07f7e4cbcee..124270df873 100644 --- a/include/linux/slub_def.h +++ b/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);