From 03147ab8c81de05aa74ad7dbb6221878ac770f39 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizefan@huawei.com>
Date: Mon, 29 Apr 2013 15:08:43 -0700
Subject: [PATCH] --- yaml --- r: 365453 b: refs/heads/master c:
 fd0ccaf2bd04e54d2a6979fbfdcad856694e3877 h: refs/heads/master i:   365451:
 5c86a57bd2b5038b2ad949a0807b63bc9f1ff10e v: v3

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

diff --git a/[refs] b/[refs]
index 4819c301872f..cc927385ddbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 865ffef3797da2cac85b3354b5b6050dc9660978
+refs/heads/master: fd0ccaf2bd04e54d2a6979fbfdcad856694e3877
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 360464f40e96..c92bcfc5466e 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -3215,12 +3215,12 @@ void memcg_release_cache(struct kmem_cache *s)
 
 	root = s->memcg_params->root_cache;
 	root->memcg_params->memcg_caches[id] = NULL;
-	mem_cgroup_put(memcg);
 
 	mutex_lock(&memcg->slab_caches_mutex);
 	list_del(&s->memcg_params->list);
 	mutex_unlock(&memcg->slab_caches_mutex);
 
+	mem_cgroup_put(memcg);
 out:
 	kfree(s->memcg_params);
 }