---

yaml --- r: 294356 b: refs/heads/master c: 643ac9f h: refs/heads/master v: v3
git-mirror · Mar 23, 2012 · fef5c74 · fef5c74
1 parent 8f03560
commit fef5c74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 437538267b672f9320833907f1b5acbb2605f4be
+refs/heads/master: 643ac9fc5429e85b8b7f534544b80bcc4f34c367
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -2817,7 +2817,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
 				testorder = 0;
 
 			if ((buffer_heads_over_limit && is_highmem_idx(i)) ||
-				    !zone_watermark_ok_safe(zone, order,
+				    !zone_watermark_ok_safe(zone, testorder,
 					high_wmark_pages(zone) + balance_gap,
 					end_zone, 0)) {
 				shrink_zone(priority, zone, &sc);