diff options
Diffstat (limited to 'mm/compaction.c')
| -rw-r--r-- | mm/compaction.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index c4bc5ac..1175c24 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -85,6 +85,11 @@ static unsigned long isolate_freepages_block(struct zone *zone, if (!pfn_valid_within(blockpfn)) continue; + + /* Watch for unexpected holes punched in the memmap */ + if (!memmap_valid_within(blockpfn, page, zone)) + continue; + nr_scanned++; if (!PageBuddy(page)) @@ -179,6 +184,11 @@ static void isolate_freepages(struct zone *zone, * pages do not belong to a single zone. */ page = pfn_to_page(pfn); + + /* Watch for unexpected holes punched in the memmap */ + if (!memmap_valid_within(pfn, page, zone)) + continue; + if (page_zone(page) != zone) continue; @@ -344,6 +354,11 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone, * as memory compaction should not move pages between nodes. */ page = pfn_to_page(low_pfn); + + /* Watch for unexpected holes punched in the memmap */ + if (!memmap_valid_within(low_pfn, page, zone)) + continue; + if (page_zone(page) != zone) continue; |