Merge branch 'fix/hda' into for-linus

[linux.git] / mm / page_isolation.c

diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index b70a7fec1ff6c3a4aa2c210215185b31085c8f4d..5e0ffd967452083c8209dfa0a1334416ded99f68 100644 (file)
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -130,10 +130,11 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
                if (page && get_pageblock_migratetype(page) != MIGRATE_ISOLATE)
                        break;
        }
-       if (pfn < end_pfn)
+       page = __first_valid_page(start_pfn, end_pfn - start_pfn);
+       if ((pfn < end_pfn) || !page)
                return -EBUSY;
        /* Check all pages are free or Marked as ISOLATED */
-       zone = page_zone(pfn_to_page(pfn));
+       zone = page_zone(page);
        spin_lock_irqsave(&zone->lock, flags);
        ret = __test_page_isolated_in_pageblock(start_pfn, end_pfn);
        spin_unlock_irqrestore(&zone->lock, flags);