diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 9cd938bb24fed3dfefa454a1591a7138e880d358..3f355dfaf31fa1b66d5ea0a22ded528e9585f1e6 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -15,9 +15,6 @@ struct ctl_table;
 struct user_struct;
 struct mmu_gather;
 
-#define CHECKNODE_BITS	48
-#define CHECKNODE_MASK	(~((_AC(1, UL) << CHECKNODE_BITS) - 1))
-
 #ifndef is_hugepd
 /*
  * Some architectures requires a hugepage directory format that is
diff --git a/include/linux/mman.h b/include/linux/mman.h
index f4c25c06653c098d430f2edb6f590d99bd211155..d35d984c058cafc44c44655350fe75da826422fd 100644
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -73,6 +73,20 @@ static inline int dvpp_mmap_zone(unsigned long addr) { return 0; }
 
 #endif
 
+#ifdef CONFIG_COHERENT_DEVICE
+#define CHECKNODE_BITS  48
+#define CHECKNODE_MASK	(~((_AC(1, UL) << CHECKNODE_BITS) - 1))
+static inline void set_vm_checknode(vm_flags_t vm_flags, unsigned long flags)
+{
+	if (is_set_cdmmask())
+		vm_flags |= VM_CHECKNODE | ((((flags >> MAP_HUGE_SHIFT) &
+			MAP_HUGE_MASK) << CHECKNODE_BITS) & CHECKNODE_MASK);
+}
+#else
+#define CHECKNODE_BITS	(0)
+static inline void set_vm_checknode(vm_flags_t vm_flags, unsigned long flags) {}
+#endif
+
 /*
  * Arrange for legacy / undefined architecture specific flags to be
  * ignored by mmap handling code.
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 327d24f0cf0dc83314cc4197b996c6d0d26ef3a8..7c2f51528c1cf3c70bd8f152d64ae3dbb1ed6fae 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -25,6 +25,7 @@
 #include <linux/swap.h>
 #include <linux/swapops.h>
 #include <linux/jhash.h>
+#include <linux/mman.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
diff --git a/mm/mmap.c b/mm/mmap.c
index 6197c5590ded76f19a1541286a2598e4ff472f9e..4cc9ee8a02873fa1028ea1c3d2baff519e820c8b 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1564,9 +1564,8 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
 	/* set numa node id into vm_flags,
 	 * hugetlbfs file mmap will use it to check node
 	 */
-	if (is_set_cdmmask() && (flags & MAP_CHECKNODE))
-		vm_flags |= VM_CHECKNODE | ((((flags >> MAP_HUGE_SHIFT) & MAP_HUGE_MASK)
-					<< CHECKNODE_BITS) & CHECKNODE_MASK);
+	if (flags & MAP_CHECKNODE)
+		set_vm_checknode(vm_flags, flags);
 
 	addr = mmap_region(file, addr, len, vm_flags, pgoff, uf);
 	if (!IS_ERR_VALUE(addr) &&