From 41728295e3ac3464aefa309c8247fd5cc75f5d90 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Thu, 9 Jan 2014 14:30:11 -0800 Subject: [PATCH] mm: Increase number of GFP masks The __GFP_CMA mask is now placed after all available GFP masks. With this we need to increase the total number of GFP flags. Do so accordingly. CRs-Fixed: 648978 Change-Id: I53f5f064ac16a50ee10c84ff2bb50fdb7e085bd0 Signed-off-by: Laura Abbott [lmark@codeaurora.org: resolve trivial merge conflicts] Signed-off-by: Liam Mark --- include/linux/gfp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 994f08fe426f..9796b4426710 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -185,7 +185,7 @@ struct vm_area_struct; #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* Room for N __GFP_FOO bits */ -#define __GFP_BITS_SHIFT 26 +#define __GFP_BITS_SHIFT 27 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) /*