diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 3d83a04a7eaf..a3e7ca7088fc 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -51,6 +51,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPUFREQ_DUMMY=m
 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
@@ -430,4 +432,3 @@ CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_PANIC_TIMEOUT=5
 CONFIG_SCHEDSTATS=y
 # CONFIG_RUNTIME_TESTING_MENU is not set
-CONFIG_UNWINDER_FRAME_POINTER=y