Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1f0edb1 authored by Liam Mark's avatar Liam Mark
Browse files

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: default avatarLaura Abbott <lauraa@codeaurora.org>
[lmark@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: default avatarLiam Mark <lmark@codeaurora.org>
parent 79360d60

include/linux/gfp.h

+2 −2
Original line number Diff line number Diff line
@@ -40,12 +40,12 @@ struct vm_area_struct; 
#define ___GFP_DIRECT_RECLAIM	0x400000u

#define ___GFP_WRITE		0x800000u

#define ___GFP_KSWAPD_RECLAIM	0x1000000u

#define ___GFP_CMA		0x4000000u

#ifdef CONFIG_LOCKDEP

#define ___GFP_NOLOCKDEP	0x2000000u

#else

#define ___GFP_NOLOCKDEP	0

#endif

#define ___GFP_CMA		0x4000000u

/* If the above are modified, __GFP_BITS_SHIFT may need updating */



/*
@@ -211,7 +211,7 @@ struct vm_area_struct; 
#define __GFP_NOLOCKDEP ((__force gfp_t)___GFP_NOLOCKDEP)



/* Room for N __GFP_FOO bits */

#define __GFP_BITS_SHIFT (25 + IS_ENABLED(CONFIG_LOCKDEP))

#define __GFP_BITS_SHIFT 27

#define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))



/*