Re: [PATCH v3 11/17] riscv: Convert to GENERIC_CMDLINE

Le 26/03/2021 à 15:08, Andreas Schwab a écrit :

On Mär 26 2021, Christophe Leroy wrote:

quoted

diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index f8f15332caa2..e7c91ee478d1 100644
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c

@@ -20,6 +20,7 @@
  #include <linux/swiotlb.h>
  #include <linux/smp.h>
  #include <linux/efi.h>
+#include <linux/cmdline.h>
  
  #include <asm/cpu_ops.h>
  #include <asm/early_ioremap.h>

@@ -228,10 +229,8 @@ static void __init parse_dtb(void)
  	}
  
  	pr_err("No DTB passed to the kernel\n");
-#ifdef CONFIG_CMDLINE_FORCE
-	strlcpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
+	cmdline_build(boot_command_line, NULL, COMMAND_LINE_SIZE);
  	pr_info("Forcing kernel command line to: %s\n", boot_command_line);

Shouldn't that message become conditional in some way?

You are right, I did something similar on ARM but looks like I missed it on RISCV.

Christophe