author: Masami Hiramatsu <mhiramat@kernel.org> 2021-08-05 11:10:51 +0900
committer: Steven Rostedt (VMware) <rostedt@goodmis.org> 2021-08-12 13:35:57 -0400
commit: d0ac5fbaf783d59715b8bf426fdffc8c9e84187a
parent: 12f9951d3f311acb1d4ffe8e839bc2c07983546f
Commit Summary:
Diffstat:
1 file changed, 7 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c
index f5b8246e8aa1..8d97aba78c3a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -397,6 +397,12 @@ static int __init bootconfig_params(char *param, char *val,
return 0;
}
+static int __init warn_bootconfig(char *str)
+{
+ /* The 'bootconfig' has been handled by bootconfig_params(). */
+ return 0;
+}
+
static void __init setup_boot_config(void)
{
static char tmp_cmdline[COMMAND_LINE_SIZE] __initdata;
@@ -475,9 +481,8 @@ static int __init warn_bootconfig(char *str)
pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOT_CONFIG is not set.\n");
return 0;
}
-early_param("bootconfig", warn_bootconfig);
-
#endif
+early_param("bootconfig", warn_bootconfig);
/* Change NUL term back to "=", to make "param" the whole string. */
static void __init repair_env_string(char *param, char *val)