diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index e90a44848633..ade411605f24 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -584,5 +584,6 @@ CONFIG_SCHEDSTATS=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_FUNCTION_ERROR_INJECTION=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y
+CONFIG_CC_WERROR=y
 CONFIG_CORESIGHT=y
 CONFIG_CORESIGHT_STM=y