[for-linus][PATCH] bootconfig: Fix CONFIG_BOOTTIME_TRACING dependency issue

[for-linus][PATCH] bootconfig: Fix CONFIG_BOOTTIME_TRACING dependency issue

[Steven Rostedt]

From: Masami Hiramatsu <mhiramat@kernel.org>

Since commit d8a953ddde5e ("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: d8a953ddde5e ("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>
---
 init/Kconfig         | 2 +-
 kernel/trace/Kconfig | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/init/Kconfig b/init/Kconfig
index a84e7aa89a29..8b4c3e8c05ea 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1217,7 +1217,7 @@ endif
 
 config BOOT_CONFIG
 	bool "Boot config support"
-	depends on BLK_DEV_INITRD
+	select BLK_DEV_INITRD
 	help
 	  Extra boot config allows system admin to pass a config file as
 	  complemental extension of kernel cmdline when booting.
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 795c3e02d3f1..402eef84c859 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -145,7 +145,6 @@ config BOOTTIME_TRACING
 	bool "Boot-time Tracing support"
 	depends on TRACING
 	select BOOT_CONFIG
-	default y
 	help
 	  Enable developer to setup ftrace subsystem via supplemental
 	  kernel cmdline at boot time for debugging (tracing) driver
-- 
2.20.1

Re: [for-linus][PATCH] bootconfig: Fix CONFIG_BOOTTIME_TRACING dependency issue

[Andrew Morton]

On Tue, 25 Feb 2020 19:12:37 -0500 Steven Rostedt <rostedt@goodmis.org> wrote:

> Since commit d8a953ddde5e ("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.

Confusing.  It's described as "for Linus" but d8a953ddde5e isn't in
Linus's tree.

Re: [for-linus][PATCH] bootconfig: Fix CONFIG_BOOTTIME_TRACING dependency issue

[Steven Rostedt]

On Tue, 25 Feb 2020 17:05:30 -0800
Andrew Morton <akpm@linux-foundation.org> wrote:

> On Tue, 25 Feb 2020 19:12:37 -0500 Steven Rostedt <rostedt@goodmis.org> wrote:
> 
> > Since commit d8a953ddde5e ("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.  
> 
> Confusing.  It's described as "for Linus" but d8a953ddde5e isn't in
> Linus's tree.

Ah, it's part of my last "for-linus" series. I usually wait a day to
see if there's issues before sending Linus a pull request. An issue was
found in a randconfig and this patch fixes it. I added the "for-linus"
as it was attached to my pull request that had the commit with the
issue.

I could have added this patch as [for-linus][PATCH 16/15] ;-)

-- Steve