Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index 74e5a6547c3ddb777e1b452e445d82bacbb936c7..41cc47e28ad673801874e284f54022ab4ba44890 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -527,7 +527,8 @@ static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev,
        vm_flags_t old_flags = vma->vm_flags;
 
        if (newflags == vma->vm_flags || (vma->vm_flags & VM_SPECIAL) ||
-           is_vm_hugetlb_page(vma) || vma == get_gate_vma(current->mm))
+           is_vm_hugetlb_page(vma) || vma == get_gate_vma(current->mm) ||
+           vma_is_dax(vma))
                /* don't set VM_LOCKED or VM_LOCKONFAULT and don't count */
                goto out;