|
|
@@ -88,7 +88,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype)
|
|
|
|
|
|
zone = page_zone(page);
|
|
|
spin_lock_irqsave(&zone->lock, flags);
|
|
|
- if (get_pageblock_migratetype(page) != MIGRATE_ISOLATE)
|
|
|
+ if (!is_migrate_isolate_page(page))
|
|
|
goto out;
|
|
|
|
|
|
/*
|
|
|
@@ -205,7 +205,7 @@ int undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
|
|
|
pfn < end_pfn;
|
|
|
pfn += pageblock_nr_pages) {
|
|
|
page = __first_valid_page(pfn, pageblock_nr_pages);
|
|
|
- if (!page || get_pageblock_migratetype(page) != MIGRATE_ISOLATE)
|
|
|
+ if (!page || !is_migrate_isolate_page(page))
|
|
|
continue;
|
|
|
unset_migratetype_isolate(page, migratetype);
|
|
|
}
|
|
|
@@ -262,7 +262,7 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,
|
|
|
*/
|
|
|
for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) {
|
|
|
page = __first_valid_page(pfn, pageblock_nr_pages);
|
|
|
- if (page && get_pageblock_migratetype(page) != MIGRATE_ISOLATE)
|
|
|
+ if (page && !is_migrate_isolate_page(page))
|
|
|
break;
|
|
|
}
|
|
|
page = __first_valid_page(start_pfn, end_pfn - start_pfn);
|