From 49b2507414c04d0ed81639231adb87797dd2ae9d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 24 Jun 2020 07:36:37 +0200 Subject: [PATCH] Revert "ANDROID: x86: gki_defconfig: enable LTO and CFI" This reverts commit 56d519e9e2b7d8c47b01b94c49da9932ad118347 as the LTO feature causes merge issues with 5.8-rc1. So remove it for now and allow the developer to add the latest version of the patches later on. Cc: Sami Tolvanen Signed-off-by: Greg Kroah-Hartman Change-Id: Id1a082986d0637d5906f517484cc7de3b7f10bd7 --- arch/x86/configs/gki_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 2b617536d7ca..faedb2dd3b6a 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -57,8 +57,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_IA32_EMULATION=y CONFIG_KPROBES=y -CONFIG_LTO_CLANG=y -CONFIG_CFI_CLANG=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y @@ -450,3 +448,4 @@ CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_DETECT_HUNG_TASK is not set CONFIG_SCHEDSTATS=y CONFIG_BUG_ON_DATA_CORRUPTION=y +CONFIG_UNWINDER_FRAME_POINTER=y