---

yaml --- r: 356580 b: refs/heads/master c: e4715f0 h: refs/heads/master v: v3
git-mirror · Feb 24, 2013 · 8e3910c · 8e3910c
1 parent 0194d63
commit 8e3910c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 }