Skip to content

Commit e241d14

Browse files
mhiramatrostedt
authored andcommitted
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 <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent 54a16ff commit e241d14

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

init/main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,17 +372,17 @@ static void __init setup_boot_config(const char *cmdline)
372372

373373
copy = memblock_alloc(size + 1, SMP_CACHE_BYTES);
374374
if (!copy) {
375-
pr_err("Failed to allocate memory for boot config\n");
375+
pr_err("Failed to allocate memory for bootconfig\n");
376376
return;
377377
}
378378

379379
memcpy(copy, data, size);
380380
copy[size] = '\0';
381381

382382
if (xbc_init(copy) < 0)
383-
pr_err("Failed to parse boot config\n");
383+
pr_err("Failed to parse bootconfig\n");
384384
else {
385-
pr_info("Load boot config: %d bytes\n", size);
385+
pr_info("Load bootconfig: %d bytes\n", size);
386386
/* keys starting with "kernel." are passed via cmdline */
387387
extra_command_line = xbc_make_cmdline("kernel");
388388
/* Also, "init." keys are init arguments */

0 commit comments

Comments
 (0)