diff --git a/arch/arm64/configs/msm-perf_defconfig b/arch/arm64/configs/msm-perf_defconfig
index aa84e8a28c54..9885979b2e88 100644
--- a/arch/arm64/configs/msm-perf_defconfig
+++ b/arch/arm64/configs/msm-perf_defconfig
@@ -163,7 +163,7 @@ CONFIG_COMMON_CLK_QCOM=y
 CONFIG_MSM_GCC_8916=y
 CONFIG_MSM_GCC_8996=y
 CONFIG_MSM_MMCC_8996=y
-CONFIG_HWSPINLOCK_QCOM=y
+CONFIG_REMOTE_SPINLOCK_MSM=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_QCOM_SMEM=y
 CONFIG_QCOM_SMD=y
diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig
index bd60f35aad9b..d24a1b640bb8 100644
--- a/arch/arm64/configs/msm_defconfig
+++ b/arch/arm64/configs/msm_defconfig
@@ -147,7 +147,7 @@ CONFIG_VIRTIO_MMIO=y
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_MSM_GCC_8916=y
 CONFIG_MSM_MMCC_8996=y
-CONFIG_HWSPINLOCK_QCOM=y
+CONFIG_REMOTE_SPINLOCK_MSM=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_QCOM_SMEM=y
 CONFIG_QCOM_SMD=y