aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorWilliam Lee Irwin III <wli@holomorphy.com>2004-08-26 20:36:49 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-26 20:36:49 -0700
commit591e0fdbb3df665e5f7671858a94e6dfe2155d2b (patch)
tree75804a4b51f8df40950335f879f50f8baf5382f0 /mm
parent323d129f0446331f24302609dd0736c819f06bea (diff)
downloadhistory-591e0fdbb3df665e5f7671858a94e6dfe2155d2b.tar.gz
[PATCH] /proc/pid/statm accounting fixes
Account reserved memory properly as per acahalan's speecified semantics. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/mmap.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index cac244415b6c71..ed19f6aa8a01f0 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -750,6 +750,8 @@ void __vm_stat_account(struct mm_struct *mm, unsigned long flags,
mm->stack_vm += pages;
if (flags & VM_EXEC)
mm->exec_vm += pages;
+ if (flags & (VM_RESERVED|VM_IO))
+ mm->reserved_vm += pages;
}
#endif /* CONFIG_PROC_FS */