---

yaml --- r: 232414 b: refs/heads/master c: 01c88e2 h: refs/heads/master v: v3
git-mirror · Jan 26, 2011 · 3d8c07c · 3d8c07c
1 parent d22b6d9
commit 3d8c07c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28bd65781c848d95ba6a7f58b5c4b8265a804ec6
+refs/heads/master: 01c88e2d6b7330c0cc5867fe2297e7d826e1337d
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -1832,6 +1832,7 @@ static int __mem_cgroup_do_charge(struct mem_cgroup *mem, gfp_t gfp_mask,
 		if (likely(!ret))
 			return CHARGE_OK;
 
+		res_counter_uncharge(&mem->res, csize);
 		mem_over_limit = mem_cgroup_from_res_counter(fail_res, memsw);
 		flags |= MEM_CGROUP_RECLAIM_NOSWAP;
 	} else