---

yaml --- r: 260401 b: refs/heads/master c: 108b6a7 h: refs/heads/master i: 260399: 5086ca5 v: v3
git-mirror · Jul 26, 2011 · 9eedf37 · 9eedf37
1 parent c3cbb83
commit 9eedf37
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: 4508378b9523e22a2a0175d8bf64d932fb10a67d
+refs/heads/master: 108b6a78463bb8c7163e4f9779f36ad8bbade334
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -1653,7 +1653,7 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
 	excess = res_counter_soft_limit_excess(&root_mem->res) >> PAGE_SHIFT;
 
 	/* If memsw_is_minimum==1, swap-out is of-no-use. */
-	if (!check_soft && root_mem->memsw_is_minimum)
+	if (!check_soft && !shrink && root_mem->memsw_is_minimum)
 		noswap = true;
 
 	while (1) {