openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Pekka Enberg 2009-05-25 15:01:35 +03:00
parent 83b519e8b9
commit 43ebdac42f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init/main.c
View File

@ -587,7 +587,6 @@ asmlinkage void __init start_kernel(void)
* kmem_cache_init() * kmem_cache_init()
*/ */
pidhash_init(); pidhash_init();
vmalloc_init();
vfs_caches_init_early(); vfs_caches_init_early();
sort_main_extable(); sort_main_extable();
trap_init(); trap_init();
@ -596,6 +595,7 @@ asmlinkage void __init start_kernel(void)
*/ */
mem_init(); mem_init();
kmem_cache_init(); kmem_cache_init();
vmalloc_init();
/* /*
* Set up the scheduler prior starting any interrupts (such as the * Set up the scheduler prior starting any interrupts (such as the
* timer interrupt). Full topology setup happens at smp_init() * timer interrupt). Full topology setup happens at smp_init()

3
mm/vmalloc.c
View File

@ -23,7 +23,6 @@
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <linux/radix-tree.h> #include <linux/radix-tree.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/bootmem.h>
#include <linux/pfn.h> #include <linux/pfn.h>
#include <asm/atomic.h> #include <asm/atomic.h>
@ -1032,7 +1031,7 @@ void __init vmalloc_init(void)
/* Import existing vmlist entries. */ /* Import existing vmlist entries. */
for (tmp = vmlist; tmp; tmp = tmp->next) { 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->flags = tmp->flags | VM_VM_AREA;
va->va_start = (unsigned long)tmp->addr; va->va_start = (unsigned long)tmp->addr;
va->va_end = va->va_start + tmp->size; va->va_end = va->va_start + tmp->size;