Commit 098b081b authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Linus Torvalds
Browse files

init/main.c: use memblock apis for early memory allocations

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 fall back to
exiting bootmem APIs.
Signed-off-by: default avatarSantosh Shilimkar <>
Cc: Yinghai Lu <>
Cc: Tejun Heo <>
Cc: "Rafael J. Wysocki" <>
Cc: Arnd Bergmann <>
Cc: Christoph Lameter <>
Cc: Greg Kroah-Hartman <>
Cc: Grygorii Strashko <>
Cc: H. Peter Anvin <>
Cc: Johannes Weiner <>
Cc: KAMEZAWA Hiroyuki <>
Cc: Konrad Rzeszutek Wilk <>
Cc: Michal Hocko <>
Cc: Paul Walmsley <>
Cc: Pavel Machek <>
Cc: Russell King <>
Cc: Tony Lindgren <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 26f09e9b
......@@ -355,9 +355,11 @@ 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, 0);
initcall_command_line =
memblock_virt_alloc(strlen(boot_command_line) + 1, 0);
static_command_line = memblock_virt_alloc(strlen(command_line) + 1, 0);
strcpy (saved_command_line, boot_command_line);
strcpy (static_command_line, command_line);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment