From 87442738073eede044762132b0b53a518448d5ce Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Mon, 25 May 2009 15:01:35 +0300
Subject: [PATCH] --- yaml --- r: 147115 b: refs/heads/master c:
 43ebdac42f16037263b52a5aeedcd1bfa4a9bb29 h: refs/heads/master i:   147113:
 d56d0709524c05eb5174281303cc85a44c9c7e54   147111:
 57e975168451b8651f7cc06e9de0adda7b362fda v: v3

---
 [refs]             | 2 +-
 trunk/init/main.c  | 2 +-
 trunk/mm/vmalloc.c | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9d7e00b7eea1..c80a56760b9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83b519e8b9572c319c8e0c615ee5dd7272856090
+refs/heads/master: 43ebdac42f16037263b52a5aeedcd1bfa4a9bb29
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 0ab82a453de5..6d38f9607d14 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -587,7 +587,6 @@ asmlinkage void __init start_kernel(void)
 	 * kmem_cache_init()
 	 */
 	pidhash_init();
-	vmalloc_init();
 	vfs_caches_init_early();
 	sort_main_extable();
 	trap_init();
@@ -596,6 +595,7 @@ asmlinkage void __init start_kernel(void)
 	 */
 	mem_init();
 	kmem_cache_init();
+	vmalloc_init();
 	/*
 	 * Set up the scheduler prior starting any interrupts (such as the
 	 * timer interrupt). Full topology setup happens at smp_init()
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 083716ea38c9..323513858c20 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -23,7 +23,6 @@
 #include <linux/rbtree.h>
 #include <linux/radix-tree.h>
 #include <linux/rcupdate.h>
-#include <linux/bootmem.h>
 #include <linux/pfn.h>
 
 #include <asm/atomic.h>
@@ -1032,7 +1031,7 @@ void __init vmalloc_init(void)
 
 	/* Import existing vmlist entries. */
 	for (tmp = vmlist; tmp; tmp = tmp->next) {
-		va = alloc_bootmem(sizeof(struct vmap_area));
+		va = kzalloc(sizeof(struct vmap_area), GFP_NOWAIT);
 		va->flags = tmp->flags | VM_VM_AREA;
 		va->va_start = (unsigned long)tmp->addr;
 		va->va_end = va->va_start + tmp->size;