From 6025e864bb181519e43deaf61228774d4af29af9 Mon Sep 17 00:00:00 2001
From: "Alex,Shi" <alex.shi@intel.com>
Date: Mon, 31 Oct 2011 17:08:45 -0700
Subject: [PATCH] --- yaml --- r: 272146 b: refs/heads/master c:
 f0dfcde099453aa4c0dc42473828d15a6d492936 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 06b02a89e201..e8ae3d7dad9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1f0ece6cdca973c01a46dff0eb062baafe78a85
+refs/heads/master: f0dfcde099453aa4c0dc42473828d15a6d492936
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index dd5fc86dbb82..51bc4bf3f723 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -2887,6 +2887,8 @@ static int kswapd(void *p)
 						balanced_classzone_idx);
 			order = pgdat->kswapd_max_order;
 			classzone_idx = pgdat->classzone_idx;
+			new_order = order;
+			new_classzone_idx = classzone_idx;
 			pgdat->kswapd_max_order = 0;
 			pgdat->classzone_idx = pgdat->nr_zones - 1;
 		}