summaryrefslogtreecommitdiff
path: root/mm/memory.c
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2009-03-31 15:19:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-01 08:59:11 -0700
commit0a0dd05dd7e1a800241888cbf515bf8d3dc2e59c (patch)
tree1b6a4bb52465330fd106eb810f25bb631deed6c6 /mm/memory.c
parentee99c71c59f897436ec65debb99372b3146f9985 (diff)
downloadlinux-stable-0a0dd05dd7e1a800241888cbf515bf8d3dc2e59c.tar.gz
linux-stable-0a0dd05dd7e1a800241888cbf515bf8d3dc2e59c.tar.bz2
linux-stable-0a0dd05dd7e1a800241888cbf515bf8d3dc2e59c.zip
mm: don't call mark_page_accessed() in do_swap_page()
commit bf3f3bc5e734706730c12a323f9b2068052aa1f0 (mm: don't mark_page_accessed in fault path) only remove the mark_page_accessed() in filemap_fault(). Therefore, swap-backed pages and file-backed pages have inconsistent behavior. mark_page_accessed() should be removed from do_swap_page(). Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Nick Piggin <npiggin@suse.de> Cc: Hugh Dickins <hugh@veritas.com> Cc: 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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 2032ad2fc34b..0017111214c5 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2435,8 +2435,6 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
count_vm_event(PGMAJFAULT);
}
- mark_page_accessed(page);
-
lock_page(page);
delayacct_clear_flag(DELAYACCT_PF_SWAPIN);