aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/memcontrol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index c0b065ec1571..dfeca594fd7a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1653,7 +1653,7 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
1653 excess = res_counter_soft_limit_excess(&root_mem->res) >> PAGE_SHIFT; 1653 excess = res_counter_soft_limit_excess(&root_mem->res) >> PAGE_SHIFT;
1654 1654
1655 /* If memsw_is_minimum==1, swap-out is of-no-use. */ 1655 /* If memsw_is_minimum==1, swap-out is of-no-use. */
1656 if (!check_soft && root_mem->memsw_is_minimum) 1656 if (!check_soft && !shrink && root_mem->memsw_is_minimum)
1657 noswap = true; 1657 noswap = true;
1658 1658
1659 while (1) { 1659 while (1) {