---

yaml --- r: 252043 b: refs/heads/master c: 4fd14eb h: refs/heads/master i: 252041: a985140 252039: 9116d87 v: v3
git-mirror · May 27, 2011 · 002be0e · 002be0e
1 parent af5add7
commit 002be0e
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: 246e87a9393448c20873bc5dee64be68ed559e24
+refs/heads/master: 4fd14ebf6e3b66423dfac2bc9defda7b83ee07b3
diff --git 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;
 }