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