From 05777110dbde3becfe0a9db0f9c3c79c2fba05f8 Mon Sep 17 00:00:00 2001
From: Zlatko Calusic <zlatko.calusic@iskon.hr>
Date: Fri, 28 Dec 2012 03:16:38 +0100
Subject: [PATCH] --- yaml --- r: 348040 b: refs/heads/master c:
 ecccd1248d6e6986130ffcc3b0d003cb46a485c0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a8e3f7fe461c..afb1d21f815c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 101e5c7470eb7f77ae87f966b9155f0dbb5b4698
+refs/heads/master: ecccd1248d6e6986130ffcc3b0d003cb46a485c0
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 23291b9ae871..16b42af393ac 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -2775,7 +2775,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
 		if (total_scanned && (sc.priority < DEF_PRIORITY - 2)) {
 			if (has_under_min_watermark_zone)
 				count_vm_event(KSWAPD_SKIP_CONGESTION_WAIT);
-			else
+			else if (unbalanced_zone)
 				wait_iff_congested(unbalanced_zone, BLK_RW_ASYNC, HZ/10);
 		}