RISC-V: Remove duplicate command-line parsing logic
"Linux Kernel Mailing List" <[email protected]>
| Newsgroups | gmane.linux.kernel.commits.head |
|---|---|
| Message-ID | <[email protected]> |
Web: https://git.kernel.org/torvalds/c/3e076a7e049267e9c483674d0dd1caaca565dbef Commit: 3e076a7e049267e9c483674d0dd1caaca565dbef Parent: 155d33af7eeef19909d77aa0996c1d2dd8f1fa76 Refname: refs/heads/master Author: Michael Clark <[email protected]> AuthorDate: Sat Dec 16 11:17:02 2017 -0800 Committer: Palmer Dabbelt <[email protected]> CommitDate: Tue Jan 30 19:09:52 2018 -0800 RISC-V: Remove duplicate command-line parsing logic builtin_cmdline handling is present in drivers/of/fdt.c so the duplicate logic in arch/riscv/setup.c results in duplication of the builtin command line. e.g. CONFIG_CMDLINE="root=/dev/vda ro" gets appended twice and gives "root=/dev/vda ro root=/dev/vda ro" Before this patch: [ 0.000000] Kernel command line: root=/dev/vda ro root=/dev/vda ro After this patch: [ 0.000000] Kernel command line: root=/dev/vda ro Signed-off-by: Michael Clark <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]> --- arch/riscv/kernel/setup.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index cb7b0c63014e..a548ccf48024 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -49,10 +49,6 @@ struct screen_info screen_info = { }; #endif -#ifdef CONFIG_CMDLINE_BOOL -static char __initdata builtin_cmdline[COMMAND_LINE_SIZE] = CONFIG_CMDLINE; -#endif /* CONFIG_CMDLINE_BOOL */