---

yaml --- r: 295492 b: refs/heads/master c: 496b919 h: refs/heads/master v: v3
git-mirror · Mar 24, 2012 · c7c054c · c7c054c
1 parent 5526e9f
commit c7c054c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 250f6715a4112d6686670c5a62ceb9305da94616
+refs/heads/master: 496b919b3bdd957d4b1727df79bfa3751bced1c1
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -2946,7 +2946,8 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
 				continue;
 
 			/* Would compaction fail due to lack of free memory? */
-			if (compaction_suitable(zone, order) == COMPACT_SKIPPED)
+			if (COMPACTION_BUILD &&
+			    compaction_suitable(zone, order) == COMPACT_SKIPPED)
 				goto loop_again;
 
 			/* Confirm the zone is balanced for order-0 */