Skip to content

Commit 2910b5a

Browse files
mhiramatrostedt
authored andcommitted
bootconfig: Fix CONFIG_BOOTTIME_TRACING dependency issue
Since commit d8a953d ("bootconfig: Set CONFIG_BOOT_CONFIG=n by default") also changed the CONFIG_BOOTTIME_TRACING to select CONFIG_BOOT_CONFIG to show the boot-time tracing on the menu, it introduced wrong dependencies with BLK_DEV_INITRD as below. WARNING: unmet direct dependencies detected for BOOT_CONFIG Depends on [n]: BLK_DEV_INITRD [=n] Selected by [y]: - BOOTTIME_TRACING [=y] && TRACING_SUPPORT [=y] && FTRACE [=y] && TRACING [=y] This makes the CONFIG_BOOT_CONFIG selects CONFIG_BLK_DEV_INITRD to fix this error and make CONFIG_BOOTTIME_TRACING=n by default, so that both boot-time tracing and boot configuration off but those appear on the menu list. Link: http://lkml.kernel.org/r/158264140162.23842.11237423518607465535.stgit@devnote2 Fixes: d8a953d ("bootconfig: Set CONFIG_BOOT_CONFIG=n by default") Reported-by: Randy Dunlap <[email protected]> Compiled-tested-by: Randy Dunlap <[email protected]> Signed-off-by: Masami Hiramatsu <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
1 parent 5f811c5 commit 2910b5a

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

init/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ endif
12171217

12181218
config BOOT_CONFIG
12191219
bool "Boot config support"
1220-
depends on BLK_DEV_INITRD
1220+
select BLK_DEV_INITRD
12211221
help
12221222
Extra boot config allows system admin to pass a config file as
12231223
complemental extension of kernel cmdline when booting.

kernel/trace/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ config BOOTTIME_TRACING
145145
bool "Boot-time Tracing support"
146146
depends on TRACING
147147
select BOOT_CONFIG
148-
default y
149148
help
150149
Enable developer to setup ftrace subsystem via supplemental
151150
kernel cmdline at boot time for debugging (tracing) driver

0 commit comments

Comments
 (0)