summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorTiwei Bie <tiwei.btw@antgroup.com>2024-10-11 12:04:34 +0800
committerJohannes Berg <johannes.berg@intel.com>2024-10-23 09:52:48 +0200
commitcb055b2135d82db48ca0a3ff744b158fd5400eb2 (patch)
tree15be1b3282bee1846818848f31a5705dbb957647 /arch/um
parenta34d105350b2d4b28cc2429414a16cbeeab7d31a (diff)
um: Do not propagate mem 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 "mem=2G", will be passed to user space. Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com> Link: https://patch.msgid.link/20241011040441.1586345-3-tiwei.btw@antgroup.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/kernel/physmem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index 636830fe00f2..d60df3626727 100644
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -139,6 +139,8 @@ EXPORT_SYMBOL(phys_mapping);
static int __init uml_mem_setup(char *line, int *add)
{
char *retptr;
+
+ *add = 0;
physmem_size = memparse(line,&retptr);
return 0;
}