Commit d8a953dd authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

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: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 7ab215f2

init/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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.

init/main.c

+8 −0
Original line number Diff line number Diff line
@@ -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. */

kernel/trace/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE