From: Benoit Boissinot kernel/fork.c:1249: error: static declaration of ‘mm_cachep’ follows non-static declaration include/linux/slab.h:117: error: previous declaration of ‘mm_cachep’ was here make[1]: *** [kernel/fork.o] Error 1 make: *** [kernel] Error 2 Signed-off-by: Benoit Boissinot Signed-off-by: Andrew Morton --- 25-akpm/include/linux/slab.h | 1 - 25-akpm/kernel/fork.c | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff -puN include/linux/slab.h~kernel-forkc-make-mm_cachep-static-fix include/linux/slab.h --- 25/include/linux/slab.h~kernel-forkc-make-mm_cachep-static-fix Mon Jan 24 14:36:22 2005 +++ 25-akpm/include/linux/slab.h Mon Jan 24 14:36:22 2005 @@ -114,7 +114,6 @@ extern int FASTCALL(kmem_ptr_validate(km /* System wide caches */ extern kmem_cache_t *vm_area_cachep; -extern kmem_cache_t *mm_cachep; extern kmem_cache_t *names_cachep; extern kmem_cache_t *files_cachep; extern kmem_cache_t *filp_cachep; diff -puN kernel/fork.c~kernel-forkc-make-mm_cachep-static-fix kernel/fork.c --- 25/kernel/fork.c~kernel-forkc-make-mm_cachep-static-fix Mon Jan 24 14:36:22 2005 +++ 25-akpm/kernel/fork.c Mon Jan 24 14:36:22 2005 @@ -81,6 +81,24 @@ int nr_processes(void) static kmem_cache_t *task_struct_cachep; #endif +/* SLAB cache for signal_struct structures (tsk->signal) */ +kmem_cache_t *signal_cachep; + +/* SLAB cache for sighand_struct structures (tsk->sighand) */ +kmem_cache_t *sighand_cachep; + +/* SLAB cache for files_struct structures (tsk->files) */ +kmem_cache_t *files_cachep; + +/* SLAB cache for fs_struct structures (tsk->fs) */ +kmem_cache_t *fs_cachep; + +/* SLAB cache for vm_area_struct structures */ +kmem_cache_t *vm_area_cachep; + +/* SLAB cache for mm_struct structures (tsk->mm) */ +static kmem_cache_t *mm_cachep; + void free_task(struct task_struct *tsk) { free_thread_info(tsk->thread_info); @@ -1230,24 +1248,6 @@ long do_fork(unsigned long clone_flags, return pid; } -/* SLAB cache for signal_struct structures (tsk->signal) */ -kmem_cache_t *signal_cachep; - -/* SLAB cache for sighand_struct structures (tsk->sighand) */ -kmem_cache_t *sighand_cachep; - -/* SLAB cache for files_struct structures (tsk->files) */ -kmem_cache_t *files_cachep; - -/* SLAB cache for fs_struct structures (tsk->fs) */ -kmem_cache_t *fs_cachep; - -/* SLAB cache for vm_area_struct structures */ -kmem_cache_t *vm_area_cachep; - -/* SLAB cache for mm_struct structures (tsk->mm) */ -static kmem_cache_t *mm_cachep; - void __init proc_caches_init(void) { sighand_cachep = kmem_cache_create("sighand_cache", _