---

yaml --- r: 118443 b: refs/heads/master c: a70dcb9 h: refs/heads/master i: 118441: 2d6d11b 118439: 23dee9d v: v3
git-mirror · Nov 6, 2008 · 934b6d2 · 934b6d2
1 parent 433324f
commit 934b6d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c87591b719737b4e91eb1a9fa8fd55a4ff1886d6
+refs/heads/master: a70dcb969f64e2fa98c24f47854f20bf02ff0092
diff --git a/trunk/mm/page_isolation.c b/trunk/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);