aboutsummaryrefslogtreecommitdiffstats
path: root/mm/shmem.c
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2009-01-06 17:38:57 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 18:58:58 -0500
commit390722baa7fc447b0a4f0c3c3f537ed056dbc944 (patch)
tree7cdcf1fb968691cf9eaa52ce13813cba6ca24ee2 /mm/shmem.c
parentbf3f3bc5e734706730c12a323f9b2068052aa1f0 (diff)
mm: don't mark_page_accessed in shmem_fault
Following "mm: don't mark_page_accessed in fault path", which now places a mark_page_accessed() in zap_pte_range(), we should remove the mark_page_accessed() from shmem_fault(). Signed-off-by: Hugh Dickins <hugh@veritas.com> Cc: Nick Piggin <npiggin@suse.de> Cc: Johannes Weiner <hannes@saeurebad.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/shmem.c')
-rw-r--r--mm/shmem.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index f1b0d4871f3..24f18fdee6e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1444,7 +1444,6 @@ static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
1444 if (error) 1444 if (error)
1445 return ((error == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS); 1445 return ((error == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS);
1446 1446
1447 mark_page_accessed(vmf->page);
1448 return ret | VM_FAULT_LOCKED; 1447 return ret | VM_FAULT_LOCKED;
1449} 1448}
1450 1449