From: mdf@kernel.org (Moritz Fischer)
To: linux-riscv@lists.infradead.org
Subject: [RFC/PATCH] risc-v: Fix issue ignoring CONFIG_CMDLINE_OVERRIDE
Date: Mon, 12 Mar 2018 20:26:09 -0700 [thread overview]
Message-ID: <20180313032609.405-1-mdf@kernel.org> (raw)
Fix issue where CONFIG_CMDLINE_OVERRIDE is being
ignored.
Signed-off-by: Trung Tran <trung.tran@ettus.com>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
---
Hi all,
not sure this is the right fix, hopefully someone
can chime in and come up with the correct solution.
Thanks,
Moritz
---
arch/riscv/kernel/setup.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index 09f7064e898c..e24191a0c244 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -38,6 +38,8 @@
#include <asm/tlbflush.h>
#include <asm/thread_info.h>
+static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
+
#ifdef CONFIG_DUMMY_CONSOLE
struct screen_info screen_info = {
.orig_video_lines = 30,
@@ -194,7 +196,11 @@ static void __init setup_bootmem(void)
void __init setup_arch(char **cmdline_p)
{
+#if defined(CONFIG_CMDLINE_OVERRIDE)
+ *cmdline_p = default_command_line;
+#else
*cmdline_p = boot_command_line;
+#endif
parse_early_param();
--
2.16.2
reply other threads:[~2018-03-13 3:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180313032609.405-1-mdf@kernel.org \
--to=mdf@kernel.org \
--cc=linux-riscv@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).