From 0c071460d9ad4ae358d2881c664d8c1adfbfc490 Mon Sep 17 00:00:00 2001 From: Connor O'Brien Date: Tue, 8 Feb 2022 18:48:20 -0800 Subject: [PATCH] Revert "ANDROID: GKI: defconfig: enable BTF debug info" This reverts commit 4ba142927039cfe62fdbe1c3d85baaab8acd0d64. When BTF generation is enabled for modules, we can have module load failures due to BTF mismatches even when ABI is unchanged. Currently Kconfig does not allow disabling BTF for modules only, so turn it off entirely for now. Signed-off-by: Connor O'Brien Change-Id: I0a7251397f95d6c02ba999bcf2ab9377ac0d76c3 --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 34e5bc42c483..71684bddec40 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -648,7 +648,6 @@ CONFIG_PRINTK_CALLER=y CONFIG_DYNAMIC_DEBUG_CORE=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_DWARF4=y -CONFIG_DEBUG_INFO_BTF=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 348385db498c..fd55b243958a 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -589,7 +589,6 @@ CONFIG_PRINTK_TIME=y CONFIG_DYNAMIC_DEBUG_CORE=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_INFO_DWARF4=y -CONFIG_DEBUG_INFO_BTF=y CONFIG_HEADERS_INSTALL=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y