mm: memcontrol: group kmem init and exit functions together

[cascardo/linux.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 3c6a86b..8c262e6 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -37,7 +37,8 @@ struct kmem_cache *kmem_cache;
                SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE | \
                SLAB_FAILSLAB)
 
-#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | SLAB_NOTRACK)
+#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \
+                        SLAB_NOTRACK | SLAB_ACCOUNT)
 
 /*
  * Merge control. If this is set then no merging of slab caches will occur.
@@ -502,10 +503,10 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg,
        mutex_lock(&slab_mutex);
 
        /*
-        * The memory cgroup could have been deactivated while the cache
+        * The memory cgroup could have been offlined while the cache
         * creation work was pending.
         */
-       if (!memcg_kmem_is_active(memcg))
+       if (!memcg_kmem_online(memcg))
                goto out_unlock;
 
        idx = memcg_cache_id(memcg);