From 3d8c07cdb252c46d5f674bf01fc128dfed867733 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Tue, 25 Jan 2011 15:07:27 -0800
Subject: [PATCH] --- yaml --- r: 232414 b: refs/heads/master c:
 01c88e2d6b7330c0cc5867fe2297e7d826e1337d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1f9d9596057f..1fea4ee007aa 100644
--- 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
index 4fcf47a62550..1eb1a04f874c 100644
--- 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