UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

bootconfig: Fix CONFIG_BOOTTIME_TRACING dependency issue 

Since commit d8a953ddde ("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: d8a953ddde ("bootconfig: Set CONFIG_BOOT_CONFIG=n by default")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Compiled-tested-by: Randy Dunlap <rdunlap@infradead.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-25 23:36:41 +09:00 committed by Steven Rostedt (VMware)
parent 5f811c57c9
commit 2910b5aa6f
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init/Kconfig
View File

@ -1217,7 +1217,7 @@ endif
config BOOT_CONFIG config BOOT_CONFIG
bool "Boot config support" bool "Boot config support"
depends on BLK_DEV_INITRD select BLK_DEV_INITRD
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.

1
kernel/trace/Kconfig
View File

@ -145,7 +145,6 @@ config BOOTTIME_TRACING
bool "Boot-time Tracing support" bool "Boot-time Tracing support"
depends on TRACING depends on TRACING
select BOOT_CONFIG select BOOT_CONFIG
default y
help help
Enable developer to setup ftrace subsystem via supplemental Enable developer to setup ftrace subsystem via supplemental
kernel cmdline at boot time for debugging (tracing) driver kernel cmdline at boot time for debugging (tracing) driver