slab: remove duplicate kmem_cache_init_late() declarations

kmem_cache_init_late() has been declared in slab.h

CC: Nick Piggin <npiggin@suse.de>
CC: Matt Mackall <mpm@selenic.com>
CC: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
index bb5368df4be84397f28ec90b134b63687fdcaed6..0ec00b39d006471e585a11e74759ff832f6f028b 100644 (file)
--- a/include/linux/slob_def.h
+++ b/include/linux/slob_def.h
@@ -34,9 +34,4 @@ static __always_inline void *__kmalloc(size_t size, gfp_t flags)
        return kmalloc(size, flags);
 }
 
-static inline void kmem_cache_init_late(void)
-{
-       /* Nothing to do */
-}
-
 #endif /* __LINUX_SLOB_DEF_H */

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index c1c862b1d01a2b41cccce3f462262ad4564ab782..76c831693616864f6e1badd05cc5c12cff13eb83 100644 (file)
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -304,6 +304,4 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 }
 #endif
 
-void __init kmem_cache_init_late(void);
-
 #endif /* _LINUX_SLUB_DEF_H */

diff --git a/mm/slob.c b/mm/slob.c
index 9641da3d5e58dfca1d7c79dbef99760364fa98b2..837ebd64cc346875c9f84f2d87ac4b149c137755 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -692,3 +692,8 @@ void __init kmem_cache_init(void)
 {
        slob_ready = 1;
 }
+
+void __init kmem_cache_init_late(void)
+{
+       /* Nothing to do */
+}