vmalloc: use kzalloc() instead of alloc_bootmem()

We can call vmalloc_init() after kmem_cache_init() and use kzalloc() instead of
the bootmem allocator when initializing vmalloc data structures.

Acked-by: Johannes Weiner <[email protected]>
Acked-by: Linus Torvalds <[email protected]>
Acked-by: Nick Piggin <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Yinghai Lu <[email protected]>
Signed-off-by: Pekka Enberg <[email protected]>

diff --git a/init/main.c b/init/main.c
index 0ab82a453de50a647c32ea85fd4ee60ce7cc627f..6d38f9607d1490e1eaa66b0dda5b67213330d7a9 100644 (file)
--- a/init/main.c
+++ b/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/mm/vmalloc.c b/mm/vmalloc.c
index 083716ea38c9f7ba636cababe6859cd8e3c14106..323513858c20057f3a56ec476a739f96092588e5 100644 (file)
--- a/mm/vmalloc.c
+++ b/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;