1 files changed, 7 insertions, 2 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cb416723538f..3d974cb2a1a1 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5359,9 +5359,14 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
                         /*
                          * 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.
+                         * on our next iteration of the loop. Note that it needs
+                         * to be pageblock aligned even when the region itself
+                         * is not. move_freepages_block() can shift ahead of
+                         * the valid region but still depends on correct page
+                         * metadata.
                          */
-                        pfn = memblock_next_valid_pfn(pfn, end_pfn) - 1;
+                        pfn = (memblock_next_valid_pfn(pfn, end_pfn) &
+                                        ~(pageblock_nr_pages-1)) - 1;
 #endif
                         continue;
                 }