Revert "mm: Check if any page in a pageblock is reserved before marking it MIGRATE_RE...

This reverts commit 675bed294c5136b04e283f647e5c73fb897cfd19.

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cfaa29bbc733d8c4f99ab10e87d272871c3e7e0e..70d43bf00dc6c74fc8757e3c88ce91eda06f1cc5 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2858,20 +2858,6 @@ static inline unsigned long wait_table_bits(unsigned long size)
 
 #define LONG_ALIGN(x) (((x)+(sizeof(long))-1)&~((sizeof(long))-1))
 
-/*
- * Check if a pageblock contains reserved pages
- */
-static int pageblock_is_reserved(unsigned long start_pfn)
-{
-       unsigned long end_pfn = start_pfn + pageblock_nr_pages;
-       unsigned long pfn;
-
-       for (pfn = start_pfn; pfn < end_pfn; pfn++)
-               if (PageReserved(pfn_to_page(pfn)))
-                       return 1;
-       return 0;
-}
-
 /*
  * Mark a number of pageblocks as MIGRATE_RESERVE. The number
  * of blocks reserved is based on min_wmark_pages(zone). The memory within
@@ -2911,7 +2897,7 @@ static void setup_zone_migrate_reserve(struct zone *zone)
                        continue;
 
                /* Blocks with reserved pages will never free, skip them. */
-               if (pageblock_is_reserved(pfn))
+               if (PageReserved(page))
                        continue;
 
                block_migratetype = get_pageblock_migratetype(page);