diff --git a/mm/Kconfig b/mm/Kconfig
index 114d78e74ed37ce81bc41d4f48c8f8b7820f1073..67b9a27e19bfd9d00d448b671c2c21e2e769f2c2 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -145,11 +145,10 @@ config ARCH_DISCARD_MEMBLOCK
 config COHERENT_DEVICE
 	bool "coherent device memory"
 	def_bool n
-	depends on CPUSETS && ARM64
+	depends on CPUSETS && ARM64 && NUMA
 	help
 	  Enable coherent device memory (CDM) support.
 
-
 config NO_BOOTMEM
 	bool
 
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 4900517218668a27baf0db47d5f423a1f3821e71..712061ae3911738b8c8f27e9396aa6e982465c50 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -890,9 +890,10 @@ static struct page *dequeue_huge_page_nodemask(struct hstate *h, gfp_t gfp_mask,
 	int node = -1;
 	bool mbind_cdmnode = false;
 
+#ifdef CONFIG_COHERENT_DEVICE
 	if (is_cdm_node(nid) && mpol != NULL && mpol->mode == MPOL_BIND)
 		mbind_cdmnode = true;
-
+#endif
 	zonelist = node_zonelist(nid, gfp_mask);
 
 retry_cpuset:
diff --git a/mm/ksm.c b/mm/ksm.c
index e0f85ee99d32efd4089a76223561b660cad35ab0..34c1e874f335546a3ab38ebbe69ea69fd90badab 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -2458,10 +2458,10 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
 
 		if (vma_is_dax(vma))
 			return 0;
-
+#ifdef CONFIG_COHERENT_DEVICE
 		if (is_cdm_vma(vma))
 			return 0;
-
+#endif
 #ifdef VM_SAO
 		if (*vm_flags & VM_SAO)
 			return 0;