summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-06-11 18:29:06 +0300
committerPekka Enberg <penberg@cs.helsinki.fi>2009-06-11 19:27:03 +0300
commit444f478f65c7ca4606f9965b31feed13fe2bc9fa (patch)
tree3f59865a5cbf927bfa6489ea6d024994aceb2b29 /init
parent43ebdac42f16037263b52a5aeedcd1bfa4a9bb29 (diff)
init: introduce mm_init()
As suggested by Christoph Lameter, introduce mm_init() now that we initialize all the kernel memory allocations together. Cc: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'init')
-rw-r--r--init/main.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c
index 6d38f9607d1..7917695bf71 100644
--- a/init/main.c
+++ b/init/main.c
@@ -533,6 +533,16 @@ void __init __weak thread_info_cache_init(void)
{
}
+/*
+ * Set up kernel memory allocators
+ */
+static void __init mm_init(void)
+{
+ mem_init();
+ kmem_cache_init();
+ vmalloc_init();
+}
+
asmlinkage void __init start_kernel(void)
{
char * command_line;
@@ -590,12 +600,7 @@ asmlinkage void __init start_kernel(void)
vfs_caches_init_early();
sort_main_extable();
trap_init();
- /*
- * Set up kernel memory allocators
- */
- mem_init();
- kmem_cache_init();
- vmalloc_init();
+ mm_init();
/*
* Set up the scheduler prior starting any interrupts (such as the
* timer interrupt). Full topology setup happens at smp_init()