Skip to content

Commit

Permalink
bootconfig: Use bootconfig instead of boot config
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Steven Rostedt (VMware) <[email protected]>
  • Loading branch information
mhiramat authored and rostedt committed Feb 5, 2020
1 parent 54a16ff commit e241d14
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -372,17 +372,17 @@ 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;
}

memcpy(copy, data, size);
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 */
Expand Down

0 comments on commit e241d14

Please sign in to comment.