Messages in this thread Patch in this message | | | From | Rob Clark <> | Subject | [PATCH] drm/msm: Fix build break with recent mm tree | Date | Thu, 29 Sep 2022 09:14:04 -0700 |
| |
From: Rob Clark <robdclark@chromium.org>
9178e3dcb121 ("mm: discard __GFP_ATOMIC") removed __GFP_ATOMIC, replacing it with a check for not __GFP_DIRECT_RECLAIM.
Reported-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Rob Clark <robdclark@chromium.org> --- Sorry, this was reported by Stephen earlier in the month, while I was on the other side of the globe and jetlagged. Unfortunately I forgot about it by the time I got back home. Applying this patch after 025d27239a2f ("drm/msm/gem: Evict active GEM objects when necessary") but before or after 9178e3dcb121 ("mm: discard __GFP_ATOMIC") should resolve the build breakage.
drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c index 473ced14e520..8f83454ceedf 100644 --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c @@ -27,7 +27,7 @@ static bool can_swap(void) static bool can_block(struct shrink_control *sc) { - if (sc->gfp_mask & __GFP_ATOMIC) + if (!(sc->gfp_mask & __GFP_DIRECT_RECLAIM)) return false; return current_is_kswapd() || (sc->gfp_mask & __GFP_RECLAIM); } -- 2.37.2
| |