From fef5c741aea87cd30cb510744f76e89deb8575a2 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Fri, 23 Mar 2012 02:57:31 -0700
Subject: [PATCH] --- yaml --- r: 294356 b: refs/heads/master c:
 643ac9fc5429e85b8b7f534544b80bcc4f34c367 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 6a47fb974c04..a99d03992ebe 100644
--- 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
index 49f15ef0a99a..7658fd6536dd 100644
--- 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);