]> err.no Git - linux-2.6/commit
[PATCH] mm: rss = file_rss + anon_rss
authorHugh Dickins <hugh@veritas.com>
Sun, 30 Oct 2005 01:16:05 +0000 (18:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 30 Oct 2005 04:40:38 +0000 (21:40 -0700)
commit4294621f41a85497019fae64341aa5351a1921b7
treefdeb7eb44384a99d0679ffa6de5019bab0ea2166
parent404351e67a9facb475abf1492245374a28d13e90
[PATCH] mm: rss = file_rss + anon_rss

I was lazy when we added anon_rss, and chose to change as few places as
possible.  So currently each anonymous page has to be counted twice, in rss
and in anon_rss.  Which won't be so good if those are atomic counts in some
configurations.

Change that around: keep file_rss and anon_rss separately, and add them
together (with get_mm_rss macro) when the total is needed - reading two
atomics is much cheaper than updating two atomics.  And update anon_rss
upfront, typically in memory.c, not tucked away in page_add_anon_rmap.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
12 files changed:
fs/exec.c
fs/proc/array.c
fs/proc/task_mmu.c
include/linux/sched.h
kernel/acct.c
kernel/fork.c
mm/fremap.c
mm/hugetlb.c
mm/memory.c
mm/nommu.c
mm/rmap.c
mm/swapfile.c