From 9eedf37a926ae24dad55cb5a649c3454be2943c2 Mon Sep 17 00:00:00 2001
From: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Date: Tue, 26 Jul 2011 16:08:25 -0700
Subject: [PATCH] --- yaml --- r: 260401 b: refs/heads/master c:
 108b6a78463bb8c7163e4f9779f36ad8bbade334 h: refs/heads/master i:   260399:
 5086ca5844e6bf9b5b0baeef26a2711dab708448 v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8949b7ec84a7..01dd1ebd3b11 100644
--- 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
index c0b065ec1571..dfeca594fd7a 100644
--- 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) {