diff --git a/[refs] b/[refs] index fe92ca63c51c..250d30a35f5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 246e87a9393448c20873bc5dee64be68ed559e24 +refs/heads/master: 4fd14ebf6e3b66423dfac2bc9defda7b83ee07b3 diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 1520efd1c7c4..bcb0a0bee1fc 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -1596,7 +1596,7 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem, if (!res_counter_soft_limit_excess(&root_mem->res)) return total; } else if (mem_cgroup_margin(root_mem)) - return 1 + total; + return total; } return total; }