From 2bd2d17852dc2c9e9885e8b3bf99f411e9000669 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 6 Jun 2025 10:11:44 +0000 Subject: [PATCH] ANDROID: GKI: x86: remove CFI_AUTO_DEFAULT=N from gki_defconfig In commit 5a8d073d87da ("x86/Kconfig: make CFI_AUTO_DEFAULT depend on !RUST or Rust >= 1.88"), CFI_AUTO_DEFAULT is properly handled, so no need to explicitly disable it in the gki_defconfig file. Remove it to fix up the build properly. Fixes: 5a8d073d87da ("x86/Kconfig: make CFI_AUTO_DEFAULT depend on !RUST or Rust >= 1.88") Change-Id: I4c6f565c3be56ef00625dd93fd6e85cec2dadd2e Signed-off-by: Greg Kroah-Hartman --- arch/x86/configs/gki_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 6be7afdf8ac8..567fdfb229cb 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -70,7 +70,6 @@ CONFIG_NR_CPUS=32 CONFIG_EFI=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="console=ttynull stack_depot_disable=on cgroup_disable=pressure bootconfig" -# CONFIG_CFI_AUTO_DEFAULT is not set CONFIG_HIBERNATION=y CONFIG_PM_WAKELOCKS=y CONFIG_PM_WAKELOCKS_LIMIT=0