From 53265defed78eccd7e5d46e6e88909fec6773311 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Thu, 11 Jun 2009 18:29:06 +0300
Subject: [PATCH] --- yaml --- r: 147116 b: refs/heads/master c:
 444f478f65c7ca4606f9965b31feed13fe2bc9fa h: refs/heads/master v: v3

---
 [refs]            |  2 +-
 trunk/init/main.c | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c80a56760b9b..27df4321dc81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43ebdac42f16037263b52a5aeedcd1bfa4a9bb29
+refs/heads/master: 444f478f65c7ca4606f9965b31feed13fe2bc9fa
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 6d38f9607d14..7917695bf71e 100644
--- a/trunk/init/main.c
+++ b/trunk/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()