leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootconfig: Set CONFIG_BOOT_CONFIG=n by default

Browse Source 
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>
This commit is contained in:
Masami Hiramatsu 2020-02-20 21:18:33 +09:00 committed by Steven Rostedt (VMware)
parent 7ab215f22d
commit d8a953ddde
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init/Kconfig
View File

@ -1218,7 +1218,6 @@ endif
config BOOT_CONFIG config BOOT_CONFIG
bool "Boot config support" bool "Boot config support"
depends on BLK_DEV_INITRD depends on BLK_DEV_INITRD
default y
help help
Extra boot config allows system admin to pass a config file as Extra boot config allows system admin to pass a config file as
complemental extension of kernel cmdline when booting. complemental extension of kernel cmdline when booting.

8
init/main.c
View File

@ -418,6 +418,14 @@ not_found:
} }
#else #else
#define setup_boot_config(cmdline) do { } while (0) #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 #endif
/* Change NUL term back to "=", to make "param" the whole string. */ /* Change NUL term back to "=", to make "param" the whole string. */

3
kernel/trace/Kconfig
View File

@ -143,7 +143,8 @@ if FTRACE
config BOOTTIME_TRACING config BOOTTIME_TRACING
bool "Boot-time Tracing support" bool "Boot-time Tracing support"
depends on BOOT_CONFIG && TRACING depends on TRACING
select BOOT_CONFIG
default y default y
help help
Enable developer to setup ftrace subsystem via supplemental Enable developer to setup ftrace subsystem via supplemental