From 11118ecdc996e4a0e9f9307b494e843dfc7df0fc Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Tue, 28 Jan 2020 10:05:51 -0800 Subject: [PATCH] ANDROID: gki_defconfig: Temporarily disable CFI Do this on arm64 only for now. Bug: 148458318 Change-Id: Iaa70603f1a85ce93826c5939dcff59dd68472bf9 Signed-off-by: Alistair Delva --- arch/arm64/configs/gki_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 8655318b4adb..9cdf432cfee0 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -76,7 +76,6 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_KPROBES=y CONFIG_LTO_CLANG=y -CONFIG_CFI_CLANG=y CONFIG_SHADOW_CALL_STACK=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y