From 12a48c6c449fd3ac58f6eb63055e95ce123e2e6c Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Thu, 13 Jan 2011 15:46:23 -0800
Subject: [PATCH] --- yaml --- r: 230737 b: refs/heads/master c:
 4d40502ea580c35414a1466d86f96484910ebaec h: refs/heads/master i:   230735:
 1b3c2637008eea8b213e4479b83ac992e21f6900 v: v3

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

diff --git a/[refs] b/[refs]
index 5cb3eeb96197..d5d608d6b2c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0abdee2bd4118366c62349a304f81537be69af33
+refs/heads/master: 4d40502ea580c35414a1466d86f96484910ebaec
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 46711f080f38..dafb9d91b604 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -2653,6 +2653,8 @@ static int kswapd(void *p)
 			kswapd_try_to_sleep(pgdat, order);
 			order = pgdat->kswapd_max_order;
 			classzone_idx = pgdat->classzone_idx;
+			pgdat->kswapd_max_order = 0;
+			pgdat->classzone_idx = MAX_NR_ZONES - 1;
 		}
 
 		ret = try_to_freeze();