This was originally added in 7e7844226f10 ("lockdep: allow to disable
reclaim lockup detection") but a git log -G "GFP_NOLOCKDEP" indicates
it was never used.Cc: Andrew Morton <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: "Levin, Alexander (Sasha Levin)" <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Huaisheng Ye <[email protected]> Cc: Pavel Tatashin <[email protected]> Cc: Aaron Lu <[email protected]> Cc: Oscar Salvador <[email protected]> Cc: Joonsoo Kim <[email protected]> Cc: [email protected] Cc: Dave Chinner <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Shakeel Butt <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> --- include/linux/gfp.h | 10 +--------- mm/page_alloc.c | 3 --- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 76f8db0b0e71..ea76fcf320ec 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -39,11 +39,6 @@ struct vm_area_struct; #define ___GFP_ACCOUNT 0x100000u #define ___GFP_DIRECT_RECLAIM 0x200000u #define ___GFP_KSWAPD_RECLAIM 0x400000u -#ifdef CONFIG_LOCKDEP -#define ___GFP_NOLOCKDEP 0x800000u -#else -#define ___GFP_NOLOCKDEP 0 -#endif /* If the above are modified, __GFP_BITS_SHIFT may need updating */ /* @@ -213,11 +208,8 @@ struct vm_area_struct; #define __GFP_COMP ((__force gfp_t)___GFP_COMP) #define __GFP_ZERO ((__force gfp_t)___GFP_ZERO) -/* Disable lockdep for GFP context tracking */ -#define __GFP_NOLOCKDEP ((__force gfp_t)___GFP_NOLOCKDEP) - /* Room for N __GFP_FOO bits */ -#define __GFP_BITS_SHIFT (23 + IS_ENABLED(CONFIG_LOCKDEP)) +#define __GFP_BITS_SHIFT 23 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) /** diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a919ba5cb3c8..62c9cd7eae1a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3719,9 +3719,6 @@ static bool __need_fs_reclaim(gfp_t gfp_mask) if (!(gfp_mask & __GFP_FS)) return false; - if (gfp_mask & __GFP_NOLOCKDEP) - return false; - return true; } -- 2.19.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
