diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig
index f5f0468126cd1ce568ec5baedde1e098bc36129e..a3782d0ad21647de62622f722271cf04603e4463 100644
--- a/arch/arm64/configs/hulk_defconfig
+++ b/arch/arm64/configs/hulk_defconfig
@@ -414,6 +414,7 @@ CONFIG_ARM64_ERR_RECOV=y
 CONFIG_MPAM=y
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=3
+CONFIG_NUMA_AWARE_SPINLOCKS=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
diff --git a/arch/arm64/configs/storage_ci_defconfig b/arch/arm64/configs/storage_ci_defconfig
index a60f91b0328d4775fb27f8dfc0e1eaaba3f7347f..25f0d6f7a4bcb78a7848a1a880d19c729a245f21 100644
--- a/arch/arm64/configs/storage_ci_defconfig
+++ b/arch/arm64/configs/storage_ci_defconfig
@@ -400,6 +400,7 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_MPAM is not set
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=2
+CONFIG_NUMA_AWARE_SPINLOCKS=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y