Merge tag 'trace-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-block.git] / mm / ksm.c

diff --git a/mm/ksm.c b/mm/ksm.c
index a6d43cf9a98240d31b18198fc6ef2e55e5a8713c..2621be57bd957caabd5df559d41f2c40e284a26d 100644 (file)
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -470,7 +470,7 @@ static inline bool ksm_test_exit(struct mm_struct *mm)
 static int break_ksm(struct vm_area_struct *vma, unsigned long addr)
 {
        struct page *page;
-       int ret = 0;
+       vm_fault_t ret = 0;
 
        do {
                cond_resched();
@@ -2430,6 +2430,9 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
                                 VM_HUGETLB | VM_MIXEDMAP))
                        return 0;               /* just ignore the advice */
 
+               if (vma_is_dax(vma))
+                       return 0;
+
 #ifdef VM_SAO
                if (*vm_flags & VM_SAO)
                        return 0;