LTS Refresh: Merge upto 5e70e86a0b796cd8ae07428c9883236a9bc1fbe6 (buildnumber: 17412.101.0) from main-R105-cos-5.15 to release-R105-cos-5.15.
BUG=b/277819908
TEST=presubmit
RELEASE_NOTE=LTS Refresh from main-R105-cos-5.15 to release-R105-cos-5.15
Change-Id: Ie931e663194ac7b26f8e648090187908aa9c457a
diff --git a/arch/x86/configs/lakitu_defconfig b/arch/x86/configs/lakitu_defconfig
index 1b59ebc..eb3f4c7 100644
--- a/arch/x86/configs/lakitu_defconfig
+++ b/arch/x86/configs/lakitu_defconfig
@@ -636,6 +636,7 @@
# Binary Emulations
#
CONFIG_IA32_EMULATION=y
+# CONFIG_X86_X32 is not set
CONFIG_COMPAT_32=y
CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
@@ -3893,8 +3894,6 @@
CONFIG_DEBUG_INFO_DWARF4=y
# CONFIG_DEBUG_INFO_DWARF5 is not set
CONFIG_DEBUG_INFO_BTF=y
-CONFIG_PAHOLE_HAS_SPLIT_BTF=y
-CONFIG_DEBUG_INFO_BTF_MODULES=y
# CONFIG_GDB_SCRIPTS is not set
CONFIG_FRAME_WARN=2048
# CONFIG_STRIP_ASM_SYMS is not set
