Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

1 files changed, 3 insertions, 2 deletions

diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index b70a7fec1ff6..5e0ffd967452 100644
--- 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);