From c7c054ccb7cdfebf3b2bff287321bf7cafe8f81b Mon Sep 17 00:00:00 2001
From: Rik van Riel <riel@redhat.com>
Date: Sat, 24 Mar 2012 10:26:21 -0400
Subject: [PATCH] --- yaml --- r: 295492 b: refs/heads/master c:
 496b919b3bdd957d4b1727df79bfa3751bced1c1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 47fdb48952cc..28802561626b 100644
--- 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
index 7658fd6536dd..33c332bbab73 100644
--- 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 */