lkml.org 
[lkml]   [2020]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] bootconfig: Fix CONFIG_BOOTTIME_TRACING dependency issue
Hi Hiramatsu-san,

On Tue, Feb 25, 2020 at 4:47 PM Masami Hiramatsu <mhiramat@kernel.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.
>
> 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.
>
> Fixes: d8a953ddde5e ("bootconfig: Set CONFIG_BOOT_CONFIG=n by default")
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.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

Why not "depends on BLK_DEV_INITRD?" here?

/me tries to contain the bloat introduced by the bootconfig stuff.

> select BOOT_CONFIG
> - default y
> help
> Enable developer to setup ftrace subsystem via supplemental
> kernel cmdline at boot time for debugging (tracing) driver

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

\
 
 \ /
  Last update: 2020-02-27 10:19    [W:0.320 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site