Merge tag 'v3.10.2' into linux-linaro-lsk-androidlsk-android

This is the 3.10.2 stable release

1 files changed, 0 insertions, 8 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index fd79df5d315..15b040904dc 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6296,14 +6296,6 @@ mem_cgroup_css_online(struct cgroup *cont)
 
 	error = memcg_init_kmem(memcg, &mem_cgroup_subsys);
 	mutex_unlock(&memcg_create_mutex);
-	if (error) {
-		/*
-		 * We call put now because our (and parent's) refcnts
-		 * are already in place. mem_cgroup_put() will internally
-		 * call __mem_cgroup_free, so return directly
-		 */
-		mem_cgroup_put(memcg);
-	}
 	return error;
 }