Merge branch 'config' into late-for-linus

[firefly-linux-kernel-4.4.55.git] / mm / slab.h

diff --git a/mm/slab.h b/mm/slab.h
index 077b07a24efe0f202ae61cf636d02fc48ecd97a4..7deeb449a3013ea279fde16bf6935b9d23ba752a 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -33,19 +33,15 @@ extern struct list_head slab_caches;
 extern struct kmem_cache *kmem_cache;
 
 /* Functions provided by the slab allocators */
-extern int __kmem_cache_create(struct kmem_cache *, const char *name,
-       size_t size, size_t align, unsigned long flags, void (*ctor)(void *));
+extern int __kmem_cache_create(struct kmem_cache *, unsigned long flags);
 
 #ifdef CONFIG_SLUB
 struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
        size_t align, unsigned long flags, void (*ctor)(void *));
-extern int sysfs_slab_add(struct kmem_cache *s);
 #else
 static inline struct kmem_cache *__kmem_cache_alias(const char *name, size_t size,
        size_t align, unsigned long flags, void (*ctor)(void *))
 { return NULL; }
-static inline int sysfs_slab_add(struct kmem_cache *s) { return 0; }
-
 #endif