diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index df8d2452de8a..ea0bbf35583c 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -89,6 +89,7 @@ CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_SHADOW_CALL_STACK=y
 CONFIG_CFI_CLANG=y
+CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index f3aefde25f8f..390bd98425b4 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -84,6 +84,7 @@ CONFIG_KVM_AMD=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_CFI_CLANG=y
+CONFIG_CFI_ICALL_NORMALIZE_INTEGERS=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y