From 69cd3216ffc1a60ac7363665f59de230a17ee3af Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@cmpxchg.org>
Date: Tue, 4 Dec 2012 11:11:31 -0500
Subject: [PATCH] --- yaml --- r: 336246 b: refs/heads/master c:
 c702418f8a2fa6cc92e84a39880d458faf7af9cc h: refs/heads/master v: v3

---
 [refs]            |  2 +-
 trunk/mm/vmscan.c | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 50751a2449be..713cb05d7a22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60177d31d215bc2b4c5a7aa6f742800e04fa0a92
+refs/heads/master: c702418f8a2fa6cc92e84a39880d458faf7af9cc
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 83f4d0e85601..124bbfe5cc52 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -2823,22 +2823,6 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
 			if (!populated_zone(zone))
 				continue;
 
-			if (zone->all_unreclaimable &&
-			    sc.priority != DEF_PRIORITY)
-				continue;
-
-			/* Would compaction fail due to lack of free memory? */
-			if (COMPACTION_BUILD &&
-			    compaction_suitable(zone, order) == COMPACT_SKIPPED)
-				goto loop_again;
-
-			/* Confirm the zone is balanced for order-0 */
-			if (!zone_watermark_ok(zone, 0,
-					high_wmark_pages(zone), 0, 0)) {
-				order = sc.order = 0;
-				goto loop_again;
-			}
-
 			/* Check if the memory needs to be defragmented. */
 			if (zone_watermark_ok(zone, order,
 				    low_wmark_pages(zone), *classzone_idx, 0))