diff --git a/[refs] b/[refs] index d56ed9d777b6..c43c9259974b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e234f35c54a30d040313e40833dcf623d14629b4 +refs/heads/master: 1c5ad84516ae7ea4ec868436a910a6bd8d20215a diff --git a/trunk/mm/mremap.c b/trunk/mm/mremap.c index ec7238a78f36..fc45dc9a617b 100644 --- a/trunk/mm/mremap.c +++ b/trunk/mm/mremap.c @@ -229,6 +229,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, * since do_munmap() will decrement it by old_len == new_len */ mm->total_vm += new_len >> PAGE_SHIFT; + __vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT); if (do_munmap(mm, old_addr, old_len) < 0) { /* OOM: unable to split vma, just get accounts right */ @@ -243,7 +244,6 @@ static unsigned long move_vma(struct vm_area_struct *vma, vma->vm_next->vm_flags |= VM_ACCOUNT; } - __vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT); if (vm_flags & VM_LOCKED) { mm->locked_vm += new_len >> PAGE_SHIFT; if (new_len > old_len)