[tip: x86/urgent] x86/config: Fix warning for 'make ARCH=x86_64 tinyconfig'

From: tip-bot2 for Masahiro Yamada
Date: Thu Mar 21 2024 - 05:22:17 EST


The following commit has been merged into the x86/urgent branch of tip:

Commit-ID: b0f269728ccd1d3cabcb6f3a5b610147d98a5dd6
Gitweb: https://git.kernel.org/tip/b0f269728ccd1d3cabcb6f3a5b610147d98a5dd6
Author: Masahiro Yamada <masahiroy@xxxxxxxxxx>
AuthorDate: Thu, 21 Mar 2024 00:43:12 +09:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Thu, 21 Mar 2024 10:09:41 +01:00

x86/config: Fix warning for 'make ARCH=x86_64 tinyconfig'

Kconfig emits a warning for the following command:

$ make ARCH=x86_64 tinyconfig
...
.config:1380:warning: override: UNWINDER_GUESS changes choice state

When X86_64=y, the unwinder is exclusively selected from the following
three options:

- UNWINDER_ORC
- UNWINDER_FRAME_POINTER
- UNWINDER_GUESS

However, arch/x86/configs/tiny.config only specifies the values of the
last two. UNWINDER_ORC must be explicitly disabled.

Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240320154313.612342-1-masahiroy@xxxxxxxxxx
---
arch/x86/configs/tiny.config | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/x86/configs/tiny.config b/arch/x86/configs/tiny.config
index 66c9e2a..be3ee42 100644
--- a/arch/x86/configs/tiny.config
+++ b/arch/x86/configs/tiny.config
@@ -1,5 +1,6 @@
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
+# CONFIG_UNWINDER_ORC is not set
CONFIG_UNWINDER_GUESS=y
# CONFIG_UNWINDER_FRAME_POINTER is not set