From f947b61caed58424ed1a16c5b9d5bef86963be83 Mon Sep 17 00:00:00 2001
From: Bob Liu <lliubbo@gmail.com>
Date: Tue, 26 Oct 2010 14:22:09 -0700
Subject: [PATCH] --- yaml --- r: 217495 b: refs/heads/master c:
 f6a3607e5f30dc642bead8cd95c48d47b6b4bfbb h: refs/heads/master i:   217493:
 513ce118d35de36023ed30245ba177298d21e38d   217491:
 a3ad6a8ffaeee76f196732549a5194bfb30cfbfe   217487:
 4a6b86272ea5d5c1a989ef73a4f7b20c9fdb1c61 v: v3

---
 [refs]                    | 2 +-
 trunk/mm/page_isolation.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c6eb809957bf..616f3dd199b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 572438f9b52236bd8938b1647cc15e027d27ef55
+refs/heads/master: f6a3607e5f30dc642bead8cd95c48d47b6b4bfbb
diff --git a/trunk/mm/page_isolation.c b/trunk/mm/page_isolation.c
index 5e0ffd967452..4ae42bb40892 100644
--- a/trunk/mm/page_isolation.c
+++ b/trunk/mm/page_isolation.c
@@ -86,7 +86,7 @@ undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn)
  * all pages in [start_pfn...end_pfn) must be in the same zone.
  * zone->lock must be held before call this.
  *
- * Returns 0 if all pages in the range is isolated.
+ * Returns 1 if all pages in the range is isolated.
  */
 static int
 __test_page_isolated_in_pageblock(unsigned long pfn, unsigned long end_pfn)
@@ -119,7 +119,6 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
 	struct zone *zone;
 	int ret;
 
-	pfn = start_pfn;
 	/*
 	 * Note: pageblock_nr_page != MAX_ORDER. Then, chunks of free page
 	 * is not aligned to pageblock_nr_pages.