Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Masami Hiramatsu and committed by
Steven Rostedt (VMware)
d8a953dd 7ab215f2

+10 -2
-1
init/Kconfig
··· 1218 1218 config BOOT_CONFIG 1219 1219 bool "Boot config support" 1220 1220 depends on BLK_DEV_INITRD 1221 - default y 1222 1221 help 1223 1222 Extra boot config allows system admin to pass a config file as 1224 1223 complemental extension of kernel cmdline when booting.
+8
init/main.c
··· 418 418 } 419 419 #else 420 420 #define setup_boot_config(cmdline) do { } while (0) 421 + 422 + static int __init warn_bootconfig(char *str) 423 + { 424 + pr_warn("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOTCONFIG is not set.\n"); 425 + return 0; 426 + } 427 + early_param("bootconfig", warn_bootconfig); 428 + 421 429 #endif 422 430 423 431 /* Change NUL term back to "=", to make "param" the whole string. */
+2 -1
kernel/trace/Kconfig
··· 143 143 144 144 config BOOTTIME_TRACING 145 145 bool "Boot-time Tracing support" 146 - depends on BOOT_CONFIG && TRACING 146 + depends on TRACING 147 + select BOOT_CONFIG 147 148 default y 148 149 help 149 150 Enable developer to setup ftrace subsystem via supplemental