mm: rework virtual memory accounting

[mirror_ubuntu-artful-kernel.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index de824e72c3e89a915c429455501c644d1ae22d6e..e55b157865d5cfc437c4eacd0496dbad69d5d0ab 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -317,7 +317,7 @@ static unsigned long move_vma(struct vm_area_struct *vma,
         * If this were a serious issue, we'd add a flag to do_munmap().
         */
        hiwater_vm = mm->hiwater_vm;
-       vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
+       vm_stat_account(mm, vma->vm_flags, new_len >> PAGE_SHIFT);
 
        /* Tell pfnmap has moved from this vma */
        if (unlikely(vma->vm_flags & VM_PFNMAP))
@@ -383,7 +383,8 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
                        return ERR_PTR(-EAGAIN);
        }
 
-       if (!may_expand_vm(mm, (new_len - old_len) >> PAGE_SHIFT))
+       if (!may_expand_vm(mm, vma->vm_flags,
+                               (new_len - old_len) >> PAGE_SHIFT))
                return ERR_PTR(-ENOMEM);
 
        if (vma->vm_flags & VM_ACCOUNT) {
@@ -545,7 +546,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
                                goto out;
                        }
 
-                       vm_stat_account(mm, vma->vm_flags, vma->vm_file, pages);
+                       vm_stat_account(mm, vma->vm_flags, pages);
                        if (vma->vm_flags & VM_LOCKED) {
                                mm->locked_vm += pages;
                                locked = true;