1 files changed, 10 insertions, 1 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 05c0a59323bd..6da3169d3750 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5103,8 +5103,17 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
                 if (context != MEMMAP_EARLY)
                         goto not_early;
 
-                if (!early_pfn_valid(pfn))
+                if (!early_pfn_valid(pfn)) {
+#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
+                        /*
+                         * Skip to the pfn preceding the next valid one (or
+                         * end_pfn), such that we hit a valid pfn (or end_pfn)
+                         * on our next iteration of the loop.
+                         */
+                        pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1;
+#endif
                         continue;
+                }
                 if (!early_pfn_in_nid(pfn, nid))
                         continue;
                 if (!update_defer_init(pgdat, pfn, end_pfn, &nr_initialised))