From 8e3910c0d8bb5a69f32c870cb54a38822c5c1902 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@parallels.com>
Date: Fri, 22 Feb 2013 16:34:57 -0800
Subject: [PATCH] --- yaml --- r: 356580 b: refs/heads/master c:
 e4715f01be697a3730c78f8ffffb595591d6a88c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8a61f60719f2..bd91803051de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 692e89abd154b04d212dce0c18a449bda15aac04
+refs/heads/master: e4715f01be697a3730c78f8ffffb595591d6a88c
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index f4f41c36e703..60d28e36f0e0 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -6196,6 +6196,8 @@ mem_cgroup_css_online(struct cgroup *cont)
 		 * call __mem_cgroup_free, so return directly
 		 */
 		mem_cgroup_put(memcg);
+		if (parent->use_hierarchy)
+			mem_cgroup_put(parent);
 	}
 	return error;
 }