mm: fix __GFP_BITS_MASK

Reorder ___GFP_CMA and ___GFP_NOLOCKDEP and thus fix the
__GFP_BITS_MASK.

Fixes: d46ff52af6 ("Merge android-4.19.110 (1984fff) into msm-4.19")
Change-Id: I52a78369af112ca44e3d3162b54bd7b096d07a07
Signed-off-by: Vinayak Menon <vinmenon@codeaurora.org>
This commit is contained in:
Vinayak Menon 2020-07-09 14:03:14 +05:30
parent daae246165
commit 6b163d4aa8

View File

@ -39,12 +39,12 @@ struct vm_area_struct;
#define ___GFP_ACCOUNT 0x100000u
#define ___GFP_DIRECT_RECLAIM 0x200000u
#define ___GFP_KSWAPD_RECLAIM 0x400000u
#define ___GFP_CMA 0x800000u
#ifdef CONFIG_LOCKDEP
#define ___GFP_NOLOCKDEP 0x1000000u
#define ___GFP_NOLOCKDEP 0x800000u
#else
#define ___GFP_NOLOCKDEP 0
#endif
#define ___GFP_CMA 0x1000000u
/* If the above are modified, __GFP_BITS_SHIFT may need updating */
/*