author: Jakub Kicinski <kuba@kernel.org> 2021-08-19 18:09:18 -0700
committer: Jakub Kicinski <kuba@kernel.org> 2021-08-19 18:09:18 -0700
commit: f444fea7896dbc267249d27f604082a51b8efca2
parent: 9e5f10fe577be7974c721c0c2050fa6c967d4565
Commit Summary:
Diffstat:
1 file changed, 7 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c
index 11cbbec309fa..daad6979f782 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)