bootconfig: Set CONFIG_BOOT_CONFIG=n by default

Set CONFIG_BOOT_CONFIG=n by default. This also warns
user if CONFIG_BOOT_CONFIG=n but "bootconfig" is given
in the kernel command line.

Link: http://lkml.kernel.org/r/158220111291.26565.9036889083940367969.stgit@devnote2
Suggested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/init/Kconfig b/init/Kconfig
index 4a672c6629d04068fd7f3981e07cc97d78759944..f586878410d2f86438f261c0f04740804d563261 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1218,7 +1218,6 @@ endif
 config BOOT_CONFIG
        bool "Boot config support"
        depends on BLK_DEV_INITRD
-       default y
        help
          Extra boot config allows system admin to pass a config file as
          complemental extension of kernel cmdline when booting.

diff --git a/init/main.c b/init/main.c
index 48c87f47a444134f6c09ccfe1a7f54a790195427..d96cc5f65022244d54b9d142223799f8dd7435cb 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -418,6 +418,14 @@ not_found:
 }
 #else
 #define setup_boot_config(cmdline)     do { } while (0)
+
+static int __init warn_bootconfig(char *str)
+{
+       pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOTCONFIG is not set.\n");
+       return 0;
+}
+early_param("bootconfig", warn_bootconfig);
+
 #endif
 
 /* Change NUL term back to "=", to make "param" the whole string. */

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 91e885194dbce47f7f75bbda244aadcca8672986..795c3e02d3f1d0d867795d6d6eb528bb1d71a4be 100644 (file)
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -143,7 +143,8 @@ if FTRACE
 
 config BOOTTIME_TRACING
        bool "Boot-time Tracing support"
-       depends on BOOT_CONFIG && TRACING
+       depends on TRACING
+       select BOOT_CONFIG
        default y
        help
          Enable developer to setup ftrace subsystem via supplemental