Merge tag 'v5.2' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d66bc8abe0af..8e3bc949ebcc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1826,7 +1826,8 @@ deferred_grow_zone(struct zone *zone, unsigned int order)
                                                  first_deferred_pfn)) {
                 pgdat->first_deferred_pfn = ULONG_MAX;
                 pgdat_resize_unlock(pgdat, &flags);
-                return true;
+                /* Retry only once. */
+                return first_deferred_pfn != ULONG_MAX;
         }
 
         /*