[for-next][PATCH 5/5] bootconfig: Show the number of nodes on boot message

From: Steven Rostedt
Date: Wed Feb 05 2020 - 17:21:58 EST


From: Masami Hiramatsu <mhiramat@xxxxxxxxxx>

Show the number of bootconfig nodes on boot message.

Link: 158091062297.27924.9051634676068550285.stgit@devnote2">http://lkml.kernel.org/r/158091062297.27924.9051634676068550285.stgit@devnote2

Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
init/main.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/init/main.c b/init/main.c
index 2de2f9f7aab9..491f1cdb3105 100644
--- a/init/main.c
+++ b/init/main.c
@@ -342,6 +342,7 @@ static void __init setup_boot_config(const char *cmdline)
char *data, *copy;
const char *p;
u32 *hdr;
+ int ret;

p = strstr(cmdline, "bootconfig");
if (!p || (p != cmdline && !isspace(*(p-1))) ||
@@ -379,10 +380,11 @@ static void __init setup_boot_config(const char *cmdline)
memcpy(copy, data, size);
copy[size] = '\0';

- if (xbc_init(copy) < 0)
+ ret = xbc_init(copy);
+ if (ret < 0)
pr_err("Failed to parse bootconfig\n");
else {
- pr_info("Load bootconfig: %d bytes\n", size);
+ pr_info("Load bootconfig: %d bytes %d nodes\n", size, ret);
/* keys starting with "kernel." are passed via cmdline */
extra_command_line = xbc_make_cmdline("kernel");
/* Also, "init." keys are init arguments */
--
2.24.1