---

yaml --- r: 164369 b: refs/heads/master c: 8e7e40d h: refs/heads/master i: 164367: 9a3da1d v: v3
git-mirror · Sep 22, 2009 · 68821c8 · 68821c8
1 parent f21dd35
commit 68821c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fb332fabd7288af9dbe7992394aa6ba97c1a537
+refs/heads/master: 8e7e40d9658cf7b2ae2b76484e235799b3ddaa97
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -4906,13 +4906,16 @@ int set_migratetype_isolate(struct page *page)
 	struct zone *zone;
 	unsigned long flags;
 	int ret = -EBUSY;
+	int zone_idx;
 
 	zone = page_zone(page);
+	zone_idx = zone_idx(zone);
 	spin_lock_irqsave(&zone->lock, flags);
 	/*
 	 * In future, more migrate types will be able to be isolation target.
 	 */
-	if (get_pageblock_migratetype(page) != MIGRATE_MOVABLE)
+	if (get_pageblock_migratetype(page) != MIGRATE_MOVABLE &&
+	    zone_idx != ZONE_MOVABLE)
 		goto out;
 	set_pageblock_migratetype(page, MIGRATE_ISOLATE);
 	move_freepages_block(zone, page, MIGRATE_ISOLATE);