1 files changed, 10 insertions, 1 deletions

diff --git a/mm/compaction.c b/mm/compaction.c
index bd939a574b84..d9ebebe1a2aa 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -330,8 +330,17 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
                         continue;
                 nr_scanned++;
 
-                /* Get the page and skip if free */
+                /*
+                 * Get the page and ensure the page is within the same zone.
+                 * See the comment in isolate_freepages about overlapping
+                 * nodes. It is deliberate that the new zone lock is not taken
+                 * as memory compaction should not move pages between nodes.
+                 */
                 page = pfn_to_page(low_pfn);
+                if (page_zone(page) != zone)
+                        continue;
+
+                /* Skip if free */
                 if (PageBuddy(page))
                         continue;