@@ -1737,8 +1737,7 @@ static unsigned long fast_find_migrateblock(struct compact_control *cc)
1737
1737
* starting at the block pointed to by the migrate scanner pfn within
1738
1738
* compact_control.
1739
1739
*/
1740
- static isolate_migrate_t isolate_migratepages (struct zone * zone ,
1741
- struct compact_control * cc )
1740
+ static isolate_migrate_t isolate_migratepages (struct compact_control * cc )
1742
1741
{
1743
1742
unsigned long block_start_pfn ;
1744
1743
unsigned long block_end_pfn ;
@@ -1756,8 +1755,8 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
1756
1755
*/
1757
1756
low_pfn = fast_find_migrateblock (cc );
1758
1757
block_start_pfn = pageblock_start_pfn (low_pfn );
1759
- if (block_start_pfn < zone -> zone_start_pfn )
1760
- block_start_pfn = zone -> zone_start_pfn ;
1758
+ if (block_start_pfn < cc -> zone -> zone_start_pfn )
1759
+ block_start_pfn = cc -> zone -> zone_start_pfn ;
1761
1760
1762
1761
/*
1763
1762
* fast_find_migrateblock marks a pageblock skipped so to avoid
@@ -1787,8 +1786,8 @@ static isolate_migrate_t isolate_migratepages(struct zone *zone,
1787
1786
if (!(low_pfn % (SWAP_CLUSTER_MAX * pageblock_nr_pages )))
1788
1787
cond_resched ();
1789
1788
1790
- page = pageblock_pfn_to_page (block_start_pfn , block_end_pfn ,
1791
- zone );
1789
+ page = pageblock_pfn_to_page (block_start_pfn ,
1790
+ block_end_pfn , cc -> zone );
1792
1791
if (!page )
1793
1792
continue ;
1794
1793
@@ -2169,7 +2168,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
2169
2168
cc -> rescan = true;
2170
2169
}
2171
2170
2172
- switch (isolate_migratepages (cc -> zone , cc )) {
2171
+ switch (isolate_migratepages (cc )) {
2173
2172
case ISOLATE_ABORT :
2174
2173
ret = COMPACT_CONTENDED ;
2175
2174
putback_movable_pages (& cc -> migratepages );
0 commit comments