[PATCH] mm: vm_stat_account unshackled
The original vm_stat_account has fallen into disuse, with only one user, and only one user of vm_stat_unaccount. It's easier to keep track if we convert them all to __vm_stat_account, then free it from its __shackles. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
72866f6f27
commit
ab50b8ed81
@@ -233,7 +233,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);
|
||||
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 */
|
||||
@@ -384,7 +384,7 @@ unsigned long do_mremap(unsigned long addr,
|
||||
addr + new_len, vma->vm_pgoff, NULL);
|
||||
|
||||
current->mm->total_vm += pages;
|
||||
__vm_stat_account(vma->vm_mm, vma->vm_flags,
|
||||
vm_stat_account(vma->vm_mm, vma->vm_flags,
|
||||
vma->vm_file, pages);
|
||||
if (vma->vm_flags & VM_LOCKED) {
|
||||
current->mm->locked_vm += pages;
|
||||
|
Reference in New Issue
Block a user