diff options
author | KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | 2009-03-31 18:19:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 11:59:11 -0400 |
commit | 0a0dd05dd7e1a800241888cbf515bf8d3dc2e59c (patch) | |
tree | 1b6a4bb52465330fd106eb810f25bb631deed6c6 /mm | |
parent | ee99c71c59f897436ec65debb99372b3146f9985 (diff) |
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')
-rw-r--r-- | mm/memory.c | 2 |
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, | |||
2435 | count_vm_event(PGMAJFAULT); | 2435 | count_vm_event(PGMAJFAULT); |
2436 | } | 2436 | } |
2437 | 2437 | ||
2438 | mark_page_accessed(page); | ||
2439 | |||
2440 | lock_page(page); | 2438 | lock_page(page); |
2441 | delayacct_clear_flag(DELAYACCT_PF_SWAPIN); | 2439 | delayacct_clear_flag(DELAYACCT_PF_SWAPIN); |
2442 | 2440 | ||