powerpc: Wireup the kcmp syscall to sys_ni

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

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 081f1b8d9a7b21ae5fb4824fd3e08200fc7f0071..3f3cd97d3fdf6503ef7a1dda55ed16fb9d6f57e4 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -164,7 +164,8 @@ unsigned long calculate_alignment(unsigned long flags,
 
 struct kmem_cache *
 kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
-                       size_t align, unsigned long flags, void (*ctor)(void *))
+                       size_t align, unsigned long flags, void (*ctor)(void *),
+                       struct kmem_cache *parent_cache)
 {
        struct kmem_cache *s = NULL;
        int err = 0;
@@ -193,7 +194,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
                s->align = calculate_alignment(flags, align, size);
                s->ctor = ctor;
 
-               if (memcg_register_cache(memcg, s)) {
+               if (memcg_register_cache(memcg, s, parent_cache)) {
                        kmem_cache_free(kmem_cache, s);
                        err = -ENOMEM;
                        goto out_locked;
@@ -243,7 +244,7 @@ struct kmem_cache *
 kmem_cache_create(const char *name, size_t size, size_t align,
                  unsigned long flags, void (*ctor)(void *))
 {
-       return kmem_cache_create_memcg(NULL, name, size, align, flags, ctor);
+       return kmem_cache_create_memcg(NULL, name, size, align, flags, ctor, NULL);
 }
 EXPORT_SYMBOL(kmem_cache_create);