Commit 66ee3636 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Borislav Petkov (AMD)
Browse files

x86/kconfig: Select ARCH_WANT_FRAME_POINTERS again when UNWINDER_FRAME_POINTER=y 



It took me some time to understand the purpose of the tricky code at
the end of arch/x86/Kconfig.debug.

Without it, the following would be shown:

  WARNING: unmet direct dependencies detected for FRAME_POINTER

because

  81d38719 ("x86/kconfig: Consolidate unwinders into multiple choice selection")

removed 'select ARCH_WANT_FRAME_POINTERS'.

The correct and more straightforward approach should have been to move
it where 'select FRAME_POINTER' is located.

Several architectures properly handle the conditional selection of
ARCH_WANT_FRAME_POINTERS. For example, 'config UNWINDER_FRAME_POINTER'
in arch/arm/Kconfig.debug.

Fixes: 81d38719 ("x86/kconfig: Consolidate unwinders into multiple choice selection")
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Link: https://lore.kernel.org/r/20240204122003.53795-1-masahiroy@kernel.org
parent 9dba9c67

arch/x86/Kconfig.debug

+1 −4
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ config UNWINDER_ORC 


config UNWINDER_FRAME_POINTER

	bool "Frame pointer unwinder"

	select ARCH_WANT_FRAME_POINTERS

	select FRAME_POINTER

	help

	  This option enables the frame pointer unwinder for unwinding kernel
@@ -271,7 +272,3 @@ config UNWINDER_GUESS 
	  overhead.



endchoice
 


config FRAME_POINTER

	depends on !UNWINDER_ORC && !UNWINDER_GUESS

	bool