openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Masami Hiramatsu 2020-02-05 22:49:54 +09:00 committed by Steven Rostedt (VMware)
parent 54a16ff6f2
commit e241d14a82
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init/main.c
View File

@ -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 */