aboutsummaryrefslogtreecommitdiffstats
path: root/mm/rmap.c
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2009-01-06 17:39:27 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 18:59:02 -0500
commitcbf84b7add8103b92aaa84928e335df726bfc8da (patch)
tree04e3ef2b3f70e5bf647f4f4c8c3ce50dd12e8474 /mm/rmap.c
parent2afd1c928f1132b8d0099866e75ce8ad713a1180 (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/rmap.c')
-rw-r--r--mm/rmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/rmap.c b/mm/rmap.c
index 892e1877366b..b1770b11a571 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -47,7 +47,6 @@
47#include <linux/rmap.h> 47#include <linux/rmap.h>
48#include <linux/rcupdate.h> 48#include <linux/rcupdate.h>
49#include <linux/module.h> 49#include <linux/module.h>
50#include <linux/mm_inline.h>
51#include <linux/kallsyms.h> 50#include <linux/kallsyms.h>
52#include <linux/memcontrol.h> 51#include <linux/memcontrol.h>
53#include <linux/mmu_notifier.h> 52#include <linux/mmu_notifier.h>
@@ -673,10 +672,11 @@ void page_add_new_anon_rmap(struct page *page,
673 struct vm_area_struct *vma, unsigned long address) 672 struct vm_area_struct *vma, unsigned long address)
674{ 673{
675 VM_BUG_ON(address < vma->vm_start || address >= vma->vm_end); 674 VM_BUG_ON(address < vma->vm_start || address >= vma->vm_end);
676 atomic_set(&page->_mapcount, 0); /* elevate count by 1 (starts at -1) */ 675 SetPageSwapBacked(page);
676 atomic_set(&page->_mapcount, 0); /* increment count (starts at -1) */
677 __page_set_anon_rmap(page, vma, address); 677 __page_set_anon_rmap(page, vma, address);
678 if (page_evictable(page, vma)) 678 if (page_evictable(page, vma))
679 lru_cache_add_lru(page, LRU_ACTIVE + page_is_file_cache(page)); 679 lru_cache_add_lru(page, LRU_ACTIVE_ANON);
680 else 680 else
681 add_page_to_unevictable_list(page); 681 add_page_to_unevictable_list(page);
682} 682}