From c99312cfb3fae94bb19e64f2f132cb16d2d197ba Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Sat, 5 Sep 2009 11:17:11 -0700
Subject: [PATCH] --- yaml --- r: 157194 b: refs/heads/master c:
 dd5d241ea955006122d76af88af87de73fec25b4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c3c9963da84b..f87d28998bd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a190887b58c32d19c2eee007c5eb8faa970a69ba
+refs/heads/master: dd5d241ea955006122d76af88af87de73fec25b4
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 5cc986eb9f6f..a0de15f46987 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -817,13 +817,15 @@ __rmqueue_fallback(struct zone *zone, int order, int start_migratetype)
 			 * agressive about taking ownership of free pages
 			 */
 			if (unlikely(current_order >= (pageblock_order >> 1)) ||
-					start_migratetype == MIGRATE_RECLAIMABLE) {
+					start_migratetype == MIGRATE_RECLAIMABLE ||
+					page_group_by_mobility_disabled) {
 				unsigned long pages;
 				pages = move_freepages_block(zone, page,
 								start_migratetype);
 
 				/* Claim the whole block if over half of it is free */
-				if (pages >= (1 << (pageblock_order-1)))
+				if (pages >= (1 << (pageblock_order-1)) ||
+						page_group_by_mobility_disabled)
 					set_pageblock_migratetype(page,
 								start_migratetype);