From: Tiwei Bie <tiwei.btw@antgroup.com>
Date: Fri, 11 Oct 2024 04:04:36 +0000 (+0800)
Subject: um: Do not propagate dtb parameter to kernel
X-Git-Tag: v6.13-rc1~18^2~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7da0c611579b722ac649cd5bc4a0e8151f70e9ee;p=thirdparty%2Fkernel%2Flinux.git

um: Do not propagate dtb parameter to kernel

This parameter is UML specific and is unknown to kernel. It should not
be propagated to kernel, otherwise it will be passed to user space as
an environment option by kernel with a warning like:

Unknown kernel command line parameters "dtb=/foo", will be passed to user space.

Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
Link: https://patch.msgid.link/20241011040441.1586345-5-tiwei.btw@antgroup.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/arch/um/kernel/dtb.c b/arch/um/kernel/dtb.c
index 4954188a6a090..73369446ed1ef 100644
--- a/arch/um/kernel/dtb.c
+++ b/arch/um/kernel/dtb.c
@@ -31,6 +31,7 @@ void uml_dtb_init(void)
 
 static int __init uml_dtb_setup(char *line, int *add)
 {
+	*add = 0;
 	dtb = line;
 	return 0;
 }