diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d0d8e10d8525..026681880a1e 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3424,7 +3424,7 @@ static struct page *__rmqueue_pcplist(struct zone *zone, int migratetype,
 	do {
 		/* First try to get CMA pages */
 		if (migratetype == MIGRATE_MOVABLE &&
-				gfp_flags & __GFP_CMA) {
+				alloc_flags & ALLOC_CMA) {
 			list = get_populated_pcp_list(zone, 0, pcp,
 					get_cma_migrate_type(), alloc_flags);
 		}
@@ -3509,7 +3509,8 @@ struct page *rmqueue(struct zone *preferred_zone,
 				trace_mm_page_alloc_zone_locked(page, order, migratetype);
 		}
 		if (!page) {
-			if (gfp_flags & __GFP_CMA && migratetype == MIGRATE_MOVABLE)
+			if (migratetype == MIGRATE_MOVABLE &&
+					alloc_flags & ALLOC_CMA)
 				page = __rmqueue_cma(zone, order, migratetype,
 						     alloc_flags);
 			if (!page)