[PATCH v2 09/23] mm/init: Use memblock apis for early memory allocations
From: Santosh Shilimkar <hidden>
Date: 2013-12-03 02:29:25
Also in:
linux-mm, lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
Switch to memblock interfaces for early memory allocator instead of bootmem allocator. No functional change in beahvior than what it is in current code from bootmem users points of view. Archs already converted to NO_BOOTMEM now directly use memblock interfaces instead of bootmem wrappers build on top of memblock. And the archs which still uses bootmem, these new apis just fallback to exiting bootmem APIs. Cc: Yinghai Lu <yinghai@kernel.org> Cc: Tejun Heo <tj@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Santosh Shilimkar <redacted> --- init/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/init/main.c b/init/main.c
index febc511..934430d 100644
--- a/init/main.c
+++ b/init/main.c@@ -355,9 +355,9 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { } */ static void __init setup_command_line(char *command_line) { - saved_command_line = alloc_bootmem(strlen (boot_command_line)+1); - initcall_command_line = alloc_bootmem(strlen (boot_command_line)+1); - static_command_line = alloc_bootmem(strlen (command_line)+1); + saved_command_line = memblock_virt_alloc(strlen(boot_command_line)+1); + initcall_command_line = memblock_virt_alloc(strlen (boot_command_line)+1); + static_command_line = memblock_virt_alloc(strlen(command_line)+1); strcpy (saved_command_line, boot_command_line); strcpy (static_command_line, command_line); }
--
1.7.9.5