diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2009-08-06 11:36:25 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-08-06 11:36:25 +0300 |
| commit | bbff2e433e80fae72c8d00d482927d52ec19ba33 (patch) | |
| tree | ff20e2ccf53e8ee9ca02f83680d9c00c893285dc | |
| parent | ed680c4ad478d0fee9740f7d029087f181346564 (diff) | |
| download | kernel-crypto-bbff2e433e80fae72c8d00d482927d52ec19ba33.tar.gz kernel-crypto-bbff2e433e80fae72c8d00d482927d52ec19ba33.tar.xz kernel-crypto-bbff2e433e80fae72c8d00d482927d52ec19ba33.zip | |
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 bb5368df4be..0ec00b39d00 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) 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 c1c862b1d01..76c83169361 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) } #endif -void __init kmem_cache_init_late(void); - #endif /* _LINUX_SLUB_DEF_H */ diff --git a/mm/slob.c b/mm/slob.c index 9641da3d5e5..837ebd64cc3 100644 --- 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 */ +} |