From a95338a2e8daabed4cc26df68e0cf0a7983475e3 Mon Sep 17 00:00:00 2001
From: Sami Tolvanen <samitolvanen@google.com>
Date: Tue, 15 Dec 2020 09:48:18 -0800
Subject: [PATCH] ANDROID: x86: GKI: Enable CFI

Enable CONFIG_CFI_CLANG in gki_defconfig for x86.
Once the dust settles, we will enable for arm64.

Bug: 145210207
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: I822b7b33b46a07dc06aea6ee282d5897c138700e
---
 arch/x86/configs/gki_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index afd2cba0809b..0c4fdc7aea18 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -65,6 +65,7 @@ CONFIG_KVM_AMD=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_LTO_CLANG_THIN=y
+CONFIG_CFI_CLANG=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y