diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 5f1c74df264d1389508c8509d1f4c0da4f57646f..64ab4398ba9050dde814d732bd5215671735461a 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -181,6 +181,20 @@ extern int mpol_parse_str(char *str, struct mempolicy **mpol);
 
 extern void mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol);
 
+#ifdef CONFIG_COHERENT_DEVICE
+static inline bool is_cdm_vma(struct vm_area_struct *vma)
+{
+	if (vma->vm_flags & VM_CDM)
+		return true;
+	return false;
+}
+#else
+static inline bool is_cdm_vma(struct vm_area_struct *vma)
+{
+	return false;
+}
+#endif
+
 /* Check if a vma is migratable */
 extern bool vma_migratable(struct vm_area_struct *vma);
 
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 9c34ad6f9a678f4261e07a987d207ef393208a25..1a0cb9a4161e56e1dc3869f7ae684ad79018cd9d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2836,7 +2836,8 @@ static void task_numa_work(struct callback_head *work)
 	}
 	for (; vma; vma = vma->vm_next) {
 		if (!vma_migratable(vma) || !vma_policy_mof(vma) ||
-			is_vm_hugetlb_page(vma) || (vma->vm_flags & VM_MIXEDMAP)) {
+			is_vm_hugetlb_page(vma) || is_cdm_vma(vma) ||
+					(vma->vm_flags & VM_MIXEDMAP)) {
 			continue;
 		}