diff --git a/arch/riscv/configs/gki_defconfig b/arch/riscv/configs/gki_defconfig
index b442e293afe4..025a4dba324c 100644
--- a/arch/riscv/configs/gki_defconfig
+++ b/arch/riscv/configs/gki_defconfig
@@ -63,6 +63,7 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+CONFIG_CFI_CLANG=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y