Commit e241d14a authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)

bootconfig: Use bootconfig instead of boot config

Use "bootconfig" (1 word) instead of "boot config" (2 words)
in the boot message.

Link: http://lkml.kernel.org/r/158091059459.27924.14414336187441539879.stgit@devnote2Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 54a16ff6
...@@ -372,7 +372,7 @@ static void __init setup_boot_config(const char *cmdline) ...@@ -372,7 +372,7 @@ static void __init setup_boot_config(const char *cmdline)
copy = memblock_alloc(size + 1, SMP_CACHE_BYTES); copy = memblock_alloc(size + 1, SMP_CACHE_BYTES);
if (!copy) { if (!copy) {
pr_err("Failed to allocate memory for boot config\n"); pr_err("Failed to allocate memory for bootconfig\n");
return; return;
} }
...@@ -380,9 +380,9 @@ static void __init setup_boot_config(const char *cmdline) ...@@ -380,9 +380,9 @@ static void __init setup_boot_config(const char *cmdline)
copy[size] = '\0'; copy[size] = '\0';
if (xbc_init(copy) < 0) if (xbc_init(copy) < 0)
pr_err("Failed to parse boot config\n"); pr_err("Failed to parse bootconfig\n");
else { else {
pr_info("Load boot config: %d bytes\n", size); pr_info("Load bootconfig: %d bytes\n", size);
/* keys starting with "kernel." are passed via cmdline */ /* keys starting with "kernel." are passed via cmdline */
extra_command_line = xbc_make_cmdline("kernel"); extra_command_line = xbc_make_cmdline("kernel");
/* Also, "init." keys are init arguments */ /* Also, "init." keys are init arguments */
......
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