lkml.org 
[lkml]   [2020]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[for-next][PATCH 2/5] bootconfig: Use bootconfig instead of boot config
From: Masami Hiramatsu <mhiramat@kernel.org>

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>
---
init/main.c | 6 +++---
1 file 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 */
--
2.24.1

\
 
 \ /
  Last update: 2020-02-05 23:22    [W:0.074 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site