Skip to content

Commit d8a953d

Browse files
mhiramatrostedt
authored andcommitted
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 <[email protected]> Signed-off-by: Masami Hiramatsu <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent 7ab215f commit d8a953d

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

init/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,6 @@ endif
12181218
config BOOT_CONFIG
12191219
bool "Boot config support"
12201220
depends on BLK_DEV_INITRD
1221-
default y
12221221
help
12231222
Extra boot config allows system admin to pass a config file as
12241223
complemental extension of kernel cmdline when booting.

init/main.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,14 @@ static void __init setup_boot_config(const char *cmdline)
418418
}
419419
#else
420420
#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+
421429
#endif
422430

423431
/* Change NUL term back to "=", to make "param" the whole string. */

kernel/trace/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ if FTRACE
143143

144144
config BOOTTIME_TRACING
145145
bool "Boot-time Tracing support"
146-
depends on BOOT_CONFIG && TRACING
146+
depends on TRACING
147+
select BOOT_CONFIG
147148
default y
148149
help
149150
Enable developer to setup ftrace subsystem via supplemental

0 commit comments

Comments
 (0)