memcg, slab: never try to merge memcg caches

[karo-tx-linux.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 1ec3c619ba04b955f0d64f32ae3d432d113488f6..e77b51eb734795dcf99f0d2888ad90f5c0ee051a 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -200,9 +200,11 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
         */
        flags &= CACHE_CREATE_MASK;
 
-       s = __kmem_cache_alias(memcg, name, size, align, flags, ctor);
-       if (s)
-               goto out_unlock;
+       if (!memcg) {
+               s = __kmem_cache_alias(name, size, align, flags, ctor);
+               if (s)
+                       goto out_unlock;
+       }
 
        err = -ENOMEM;
        s = kmem_cache_zalloc(kmem_cache, GFP_KERNEL);