---

yaml --- r: 230737 b: refs/heads/master c: 4d40502 h: refs/heads/master i: 230735: 1b3c263 v: v3
git-mirror · Jan 14, 2011 · 12a48c6 · 12a48c6
1 parent 6cf3bc9
commit 12a48c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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();