On Thu, Nov 18, 2010 at 01:18:39PM +0000, Mel Gorman wrote: > This is not an exact merge with what's currently in mm. Look at the top > of gfp.h and see "Plain integer GFP bitmasks. Do not use this > directly.". The 0x400000u definition needs to go there and this becomes > > #define __GFP_NO_KSWAPD ((__force_gfp_t)____0x400000u) > > What you have just generates sparse warnings (I believe) so it's > harmless. Agreed. diff --git a/include/linux/gfp.h b/include/linux/gfp.h --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -34,6 +34,7 @@ struct vm_area_struct; #else #define ___GFP_NOTRACK 0 #endif +#define ___GFP_NO_KSWAPD 0x400000u /* * GFP bitmasks.. @@ -81,7 +82,7 @@ struct vm_area_struct; #define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE) /* Page is reclaimable */ #define __GFP_NOTRACK ((__force gfp_t)___GFP_NOTRACK) /* Don't track with kmemcheck */ -#define __GFP_NO_KSWAPD ((__force gfp_t)0x400000u) +#define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD) /* * This may seem redundant, but it's a way of annotating false positives vs. > Other than needing to define ____GFP_NO_KSWAPD 3 underscores. > Acked-by: Mel Gorman <mel@xxxxxxxxx> Added, thanks! Andrea -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>