From 6b163d4aa81f64a52413990ad82758fd145d6898 Mon Sep 17 00:00:00 2001 From: Vinayak Menon Date: Thu, 9 Jul 2020 14:03:14 +0530 Subject: [PATCH] mm: fix __GFP_BITS_MASK Reorder ___GFP_CMA and ___GFP_NOLOCKDEP and thus fix the __GFP_BITS_MASK. Fixes: d46ff52af64b ("Merge android-4.19.110 (1984fff) into msm-4.19") Change-Id: I52a78369af112ca44e3d3162b54bd7b096d07a07 Signed-off-by: Vinayak Menon --- include/linux/gfp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index a7ca2fa72cfa..a377c258bf0d 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -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 */ /*