Merge tag 'x86-urgent-2023-09-10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4524598..0c5be12 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2641,12 +2641,6 @@ struct page *rmqueue_buddy(struct zone *preferred_zone, struct zone *zone,
        do {
                page = NULL;
                spin_lock_irqsave(&zone->lock, flags);
-               /*
-                * order-0 request can reach here when the pcplist is skipped
-                * due to non-CMA allocation context. HIGHATOMIC area is
-                * reserved for high-order atomic allocation, so order-0
-                * request should skip it.
-                */
                if (alloc_flags & ALLOC_HIGHATOMIC)
                        page = __rmqueue_smallest(zone, order, MIGRATE_HIGHATOMIC);
                if (!page) {
@@ -2780,17 +2774,10 @@ struct page *rmqueue(struct zone *preferred_zone,
        WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
 
        if (likely(pcp_allowed_order(order))) {
-               /*
-                * MIGRATE_MOVABLE pcplist could have the pages on CMA area and
-                * we need to skip it when CMA area isn't allowed.
-                */
-               if (!IS_ENABLED(CONFIG_CMA) || alloc_flags & ALLOC_CMA ||
-                               migratetype != MIGRATE_MOVABLE) {
-                       page = rmqueue_pcplist(preferred_zone, zone, order,
-                                       migratetype, alloc_flags);
-                       if (likely(page))
-                               goto out;
-               }
+               page = rmqueue_pcplist(preferred_zone, zone, order,
+                                      migratetype, alloc_flags);
+               if (likely(page))
+                       goto out;
        }
 
        page = rmqueue_buddy(preferred_zone, zone, order, alloc_flags,