From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Tom Zanussi <zanussi@kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 4/4] bootconfig: Show the number of nodes on boot message
Date: Wed, 5 Feb 2020 22:50:23 +0900 [thread overview]
Message-ID: <158091062297.27924.9051634676068550285.stgit@devnote2> (raw)
In-Reply-To: <158091058484.27924.11216788166827115442.stgit@devnote2>
Show the number of bootconfig nodes on boot message.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
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 */
prev parent reply other threads:[~2020-02-05 13:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 13:49 [PATCH 0/4] bootconfig: Show more error information Masami Hiramatsu
2020-02-05 13:49 ` [PATCH 1/4] bootconfig: Use bootconfig instead of boot config Masami Hiramatsu
2020-02-05 13:50 ` [PATCH 2/4] bootconfig: Add more parse error messages Masami Hiramatsu
2020-02-05 13:50 ` [PATCH 3/4] tools/bootconfig: Show the number of bootconfig nodes Masami Hiramatsu
2020-02-05 13:50 ` Masami Hiramatsu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=158091062297.27924.9051634676068550285.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=zanussi@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox