1 files changed, 5 insertions, 4 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 17bbf4d3e24f..8d6449e74431 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1796,11 +1796,12 @@ out:
 
         vm_stat_account(mm, vm_flags, len >> PAGE_SHIFT);
         if (vm_flags & VM_LOCKED) {
-                if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
-                                        vma == get_gate_vma(current->mm)))
-                        mm->locked_vm += (len >> PAGE_SHIFT);
-                else
+                if ((vm_flags & VM_SPECIAL) || vma_is_dax(vma) ||
+                                        is_vm_hugetlb_page(vma) ||
+                                        vma == get_gate_vma(current->mm))
                         vma->vm_flags &= VM_LOCKED_CLEAR_MASK;
+                else
+                        mm->locked_vm += (len >> PAGE_SHIFT);
         }
 
         if (file)