---

yaml --- r: 42653 b: refs/heads/master c: e1dbeda h: refs/heads/master i: 42651: 3b7d2e3 v: v3
git-mirror · Dec 7, 2006 · 08ff75a · 08ff75a
1 parent c4abb57
commit 08ff75a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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;