aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-05-25 08:01:35 -0400
committerPekka Enberg <penberg@cs.helsinki.fi>2009-06-11 12:17:05 -0400
commit43ebdac42f16037263b52a5aeedcd1bfa4a9bb29 (patch)
tree8f288e9875418fbebd48f9bb31ac22ebae37838c /init/main.c
parent83b519e8b9572c319c8e0c615ee5dd7272856090 (diff)
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 <hannes@cmpxchg.org> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Acked-by: Nick Piggin <npiggin@suse.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index 0ab82a453de5..6d38f9607d14 100644
--- a/init/main.c
+++ b/init/main.c
@@ -587,7 +587,6 @@ asmlinkage void __init start_kernel(void)
587 * kmem_cache_init() 587 * kmem_cache_init()
588 */ 588 */
589 pidhash_init(); 589 pidhash_init();
590 vmalloc_init();
591 vfs_caches_init_early(); 590 vfs_caches_init_early();
592 sort_main_extable(); 591 sort_main_extable();
593 trap_init(); 592 trap_init();
@@ -596,6 +595,7 @@ asmlinkage void __init start_kernel(void)
596 */ 595 */
597 mem_init(); 596 mem_init();
598 kmem_cache_init(); 597 kmem_cache_init();
598 vmalloc_init();
599 /* 599 /*
600 * Set up the scheduler prior starting any interrupts (such as the 600 * Set up the scheduler prior starting any interrupts (such as the
601 * timer interrupt). Full topology setup happens at smp_init() 601 * timer interrupt). Full topology setup happens at smp_init()