diff options
author | Hugh Dickins <hugh@veritas.com> | 2009-01-06 17:39:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:02 -0500 |
commit | cbf84b7add8103b92aaa84928e335df726bfc8da (patch) | |
tree | 04e3ef2b3f70e5bf647f4f4c8c3ce50dd12e8474 /mm/memory.c | |
parent | 2afd1c928f1132b8d0099866e75ce8ad713a1180 (diff) |
mm: further cleanup page_add_new_anon_rmap
Moving lru_cache_add_active_or_unevictable() into page_add_new_anon_rmap()
was good but stupid: we can and should SetPageSwapBacked() there too; and
we know for sure that this anonymous, swap-backed page is not file cache.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/memory.c b/mm/memory.c index a138c50dc39a..122d965e820f 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -1948,7 +1948,6 @@ gotten: | |||
1948 | * thread doing COW. | 1948 | * thread doing COW. |
1949 | */ | 1949 | */ |
1950 | ptep_clear_flush_notify(vma, address, page_table); | 1950 | ptep_clear_flush_notify(vma, address, page_table); |
1951 | SetPageSwapBacked(new_page); | ||
1952 | page_add_new_anon_rmap(new_page, vma, address); | 1951 | page_add_new_anon_rmap(new_page, vma, address); |
1953 | set_pte_at(mm, address, page_table, entry); | 1952 | set_pte_at(mm, address, page_table, entry); |
1954 | update_mmu_cache(vma, address, entry); | 1953 | update_mmu_cache(vma, address, entry); |
@@ -2444,7 +2443,6 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
2444 | if (!pte_none(*page_table)) | 2443 | if (!pte_none(*page_table)) |
2445 | goto release; | 2444 | goto release; |
2446 | inc_mm_counter(mm, anon_rss); | 2445 | inc_mm_counter(mm, anon_rss); |
2447 | SetPageSwapBacked(page); | ||
2448 | page_add_new_anon_rmap(page, vma, address); | 2446 | page_add_new_anon_rmap(page, vma, address); |
2449 | set_pte_at(mm, address, page_table, entry); | 2447 | set_pte_at(mm, address, page_table, entry); |
2450 | 2448 | ||
@@ -2592,7 +2590,6 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, | |||
2592 | entry = maybe_mkwrite(pte_mkdirty(entry), vma); | 2590 | entry = maybe_mkwrite(pte_mkdirty(entry), vma); |
2593 | if (anon) { | 2591 | if (anon) { |
2594 | inc_mm_counter(mm, anon_rss); | 2592 | inc_mm_counter(mm, anon_rss); |
2595 | SetPageSwapBacked(page); | ||
2596 | page_add_new_anon_rmap(page, vma, address); | 2593 | page_add_new_anon_rmap(page, vma, address); |
2597 | } else { | 2594 | } else { |
2598 | inc_mm_counter(mm, file_rss); | 2595 | inc_mm_counter(mm, file_rss); |