diff options
author | Wu Fengguang <fengguang.wu@intel.com> | 2009-08-06 04:36:25 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-08-06 04:36:25 -0400 |
commit | bbff2e433e80fae72c8d00d482927d52ec19ba33 (patch) | |
tree | ff20e2ccf53e8ee9ca02f83680d9c00c893285dc | |
parent | ed680c4ad478d0fee9740f7d029087f181346564 (diff) |
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>
-rw-r--r-- | include/linux/slob_def.h | 5 | ||||
-rw-r--r-- | include/linux/slub_def.h | 2 | ||||
-rw-r--r-- | mm/slob.c | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h index bb5368df4be8..0ec00b39d006 100644 --- 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) | |||
34 | return kmalloc(size, flags); | 34 | return kmalloc(size, flags); |
35 | } | 35 | } |
36 | 36 | ||
37 | static inline void kmem_cache_init_late(void) | ||
38 | { | ||
39 | /* Nothing to do */ | ||
40 | } | ||
41 | |||
42 | #endif /* __LINUX_SLOB_DEF_H */ | 37 | #endif /* __LINUX_SLOB_DEF_H */ |
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index c1c862b1d01a..76c831693616 100644 --- 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) | |||
304 | } | 304 | } |
305 | #endif | 305 | #endif |
306 | 306 | ||
307 | void __init kmem_cache_init_late(void); | ||
308 | |||
309 | #endif /* _LINUX_SLUB_DEF_H */ | 307 | #endif /* _LINUX_SLUB_DEF_H */ |
@@ -692,3 +692,8 @@ void __init kmem_cache_init(void) | |||
692 | { | 692 | { |
693 | slob_ready = 1; | 693 | slob_ready = 1; |
694 | } | 694 | } |
695 | |||
696 | void __init kmem_cache_init_late(void) | ||
697 | { | ||
698 | /* Nothing to do */ | ||
699 | } | ||