1 files changed, 3 insertions, 4 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f3bc59f2ed52..e63bf7744a0c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2776,6 +2776,9 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
         if (unlikely(!zonelist->_zonerefs->zone))
                 return NULL;
 
+        if (IS_ENABLED(CONFIG_CMA) && migratetype == MIGRATE_MOVABLE)
+                alloc_flags |= ALLOC_CMA;
+
 retry_cpuset:
         cpuset_mems_cookie = read_mems_allowed_begin();
 
@@ -2787,10 +2790,6 @@ retry_cpuset:
                 goto out;
         classzone_idx = zonelist_zone_idx(preferred_zoneref);
 
-#ifdef CONFIG_CMA
-        if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
-                alloc_flags |= ALLOC_CMA;
-#endif
         /* First allocation attempt */
         page = get_page_from_freelist(gfp_mask|__GFP_HARDWALL, nodemask, order,
                         zonelist, high_zoneidx, alloc_flags,