diff options
| author | Hugh Dickins <hugh@veritas.com> | 2005-10-29 18:16:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 21:40:38 -0700 |
| commit | 4294621f41a85497019fae64341aa5351a1921b7 (patch) | |
| tree | fdeb7eb44384a99d0679ffa6de5019bab0ea2166 /mm/fremap.c | |
| parent | 404351e67a9facb475abf1492245374a28d13e90 (diff) | |
| download | kernel-mfld-blackbay-4294621f41a85497019fae64341aa5351a1921b7.tar.gz kernel-mfld-blackbay-4294621f41a85497019fae64341aa5351a1921b7.tar.bz2 kernel-mfld-blackbay-4294621f41a85497019fae64341aa5351a1921b7.zip | |
[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>
Diffstat (limited to 'mm/fremap.c')
| -rw-r--r-- | mm/fremap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/fremap.c b/mm/fremap.c index ab23a0673c3..fd7f2a17ff3 100644 --- a/mm/fremap.c +++ b/mm/fremap.c @@ -39,7 +39,7 @@ static inline void zap_pte(struct mm_struct *mm, struct vm_area_struct *vma, set_page_dirty(page); page_remove_rmap(page); page_cache_release(page); - dec_mm_counter(mm, rss); + dec_mm_counter(mm, file_rss); } } } else { @@ -95,7 +95,7 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma, zap_pte(mm, vma, addr, pte); - inc_mm_counter(mm,rss); + inc_mm_counter(mm, file_rss); flush_icache_page(vma, page); set_pte_at(mm, addr, pte, mk_pte(page, prot)); page_add_file_rmap(page); |