From 08ff75a488ed65cf7f1dd2e37fde7d73efc4cb67 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 6 Dec 2006 20:32:01 -0800
Subject: [PATCH] --- yaml --- r: 42653 b: refs/heads/master c:
 e1dbeda60a7ea9e82a908d93c07308d104d50d79 h: refs/heads/master i:   42651:
 3b7d2e3f74308c3508be6aaa7f462e9b5bbfca35 v: v3

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

diff --git a/[refs] b/[refs]
index 4d9cd6bcff7e..fd790c55185e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc102509074bba0316f2b5deebd7ef4447da295e
+refs/heads/master: e1dbeda60a7ea9e82a908d93c07308d104d50d79
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 518540a4a2a6..2e97baa3b2aa 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -1172,11 +1172,12 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order)
 			if (!zone_watermark_ok(zone, order, zone->pages_high,
 					       0, 0)) {
 				end_zone = i;
-				goto scan;
+				break;
 			}
 		}
-		goto out;
-scan:
+		if (i < 0)
+			goto out;
+
 		for (i = 0; i <= end_zone; i++) {
 			struct zone *zone = pgdat->node_zones + i;