diff options
| author | Andries E. Brouwer <andries.brouwer@cwi.nl> | 2004-11-13 04:59:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-13 04:59:55 -0800 |
| commit | ccc893f12db7aaca6670ce631ddc3ac27ee29b8a (patch) | |
| tree | 0161879f647fd3f5680c626f7a2736651b58cbbf | |
| parent | f21918a32a926b68998376233853dec6291066c3 (diff) | |
[PATCH] __init in mm/slab.c
The below removes an __initdata
(for initarray_generic that is referenced in non-init code).
| -rw-r--r-- | include/linux/slab.h | 3 | ||||
| -rw-r--r-- | mm/slab.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index 7c81a7863b99..93c8264fe67b 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -13,6 +13,7 @@ typedef struct kmem_cache_s kmem_cache_t; #include <linux/config.h> /* kmalloc_sizes.h needs CONFIG_ options */ #include <linux/gfp.h> +#include <linux/init.h> #include <linux/types.h> #include <asm/page.h> /* kmalloc_sizes.h needs PAGE_SIZE */ #include <asm/cache.h> /* kmalloc_sizes.h needs L1_CACHE_BYTES */ @@ -53,7 +54,7 @@ typedef struct kmem_cache_s kmem_cache_t; #define SLAB_CTOR_VERIFY 0x004UL /* tell constructor it's a verify call */ /* prototypes */ -extern void kmem_cache_init(void); +extern void __init kmem_cache_init(void); extern kmem_cache_t *kmem_cache_create(const char *, size_t, size_t, unsigned long, void (*)(void *, kmem_cache_t *, unsigned long), diff --git a/mm/slab.c b/mm/slab.c index 958d22d78383..816ad01ed806 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -509,7 +509,7 @@ static struct cache_names __initdata cache_names[] = { static struct arraycache_init initarray_cache __initdata = { { 0, BOOT_CPUCACHE_ENTRIES, 1, 0} }; -static struct arraycache_init initarray_generic __initdata = +static struct arraycache_init initarray_generic = { { 0, BOOT_CPUCACHE_ENTRIES, 1, 0} }; /* internal cache of cache description objs */ |