From 56d33a1ce175339e7357806c9bdc2fcae86b7459 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 21 Jun 2022 14:10:26 +0200 Subject: [PATCH] ANDROID: disable LTO and CFI 5.19-rc1 has merge issues with CFI at the moment, so we need to disable LTO and CFI to enable the merge to continue. This will be fixed up later in the 5.19-rcX process. Bug: 236688521 Signed-off-by: Greg Kroah-Hartman Change-Id: Ibf79663f0e31b3d083c56d793522071f4c16480b --- arch/arm64/configs/gki_defconfig | 2 -- arch/x86/configs/gki_defconfig | 1 - 2 files changed, 3 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index eb10885f99a8..f83e836d57a7 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -87,8 +87,6 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_SHADOW_CALL_STACK=y -CONFIG_LTO_CLANG_FULL=y -CONFIG_CFI_CLANG=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index ce42f3b8d107..a268cb97aff8 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -73,7 +73,6 @@ CONFIG_KVM_INTEL=y CONFIG_KVM_AMD=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y -CONFIG_LTO_CLANG_FULL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y