summaryrefslogtreecommitdiff
path: root/init/main.c
diff options
context:
space:
mode:
authorMasami Hiramatsu <mhiramat@kernel.org>2020-02-05 22:49:54 +0900
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2020-02-05 17:17:05 -0500
commite241d14a82910ffa9060d81864760c93b7256195 (patch)
treeb139332505a75d17706f7dc04ecde8708d740019 /init/main.c
parent54a16ff6f2e50775145b210bcd94d62c3c2af117 (diff)
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@devnote2 Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c
index f174a59d3903..2de2f9f7aab9 100644
--- a/init/main.c
+++ b/init/main.c
@@ -372,7 +372,7 @@ static void __init setup_boot_config(const char *cmdline)
copy = memblock_alloc(size + 1, SMP_CACHE_BYTES);
if (!copy) {
- pr_err("Failed to allocate memory for boot config\n");
+ pr_err("Failed to allocate memory for bootconfig\n");
return;
}
@@ -380,9 +380,9 @@ static void __init setup_boot_config(const char *cmdline)
copy[size] = '\0';
if (xbc_init(copy) < 0)
- pr_err("Failed to parse boot config\n");
+ pr_err("Failed to parse bootconfig\n");
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 */
extra_command_line = xbc_make_cmdline("kernel");
/* Also, "init." keys are init arguments */