RISC-V: Remove duplicate command-line parsing logic (3e076a7e) · Commits · 戴 / test

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 <mjc@sifive.com> Signed-off-by:

Palmer Dabbelt <palmer@sifive.com>

arch/riscv/kernel/setup.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -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 */

		unsigned long va_pa_offset;
		EXPORT_SYMBOL(va_pa_offset);
		unsigned long pfn_base;
		@@ -208,18 +204,6 @@ static void __init setup_bootmem(void)

		void __init setup_arch(char **cmdline_p)
		{
		#ifdef CONFIG_CMDLINE_BOOL
		#ifdef CONFIG_CMDLINE_OVERRIDE
		strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
		#else
		if (builtin_cmdline[0] != '\0') {
		/* Append bootloader command line to built-in */
		strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE);
		strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);
		strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
		}
		#endif /* CONFIG_CMDLINE_OVERRIDE */
		#endif /* CONFIG_CMDLINE_BOOL */
		*cmdline_p = boot_command_line;

		parse_early_param();

Admin message