diff options
| author | Masami Hiramatsu <mhiramat@kernel.org> | 2020-02-05 14:50:23 +0100 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2020-02-05 23:17:05 +0100 |
| commit | a00574036c261421721fa770ccd21a1012e1fbbd (patch) | |
| tree | 0ecec9bed237f9bca5bcd85ce8c37ec00f0c69bd /init | |
| parent | tools/bootconfig: Show the number of bootconfig nodes (diff) | |
| download | linux-a00574036c261421721fa770ccd21a1012e1fbbd.tar.xz linux-a00574036c261421721fa770ccd21a1012e1fbbd.zip | |
bootconfig: Show the number of nodes on boot message
Show the number of bootconfig nodes on boot message.
Link: http://lkml.kernel.org/r/158091062297.27924.9051634676068550285.stgit@devnote2
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 6 |
1 files 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 */ |