Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43ebdac4 authored by Pekka Enberg's avatar Pekka Enberg
Browse files

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: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Acked-by: default avatarNick Piggin <npiggin@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent 83b519e8

init/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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()

mm/vmalloc.c

+1 −2
Original line number Diff line number Diff line
@@ -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;