aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/rmap.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/mm/rmap.c b/mm/rmap.c
index facb8cdca665..28c6cf96d3c4 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -289,8 +289,6 @@ static int page_referenced_one(struct page *page,
289 pte_t *pte; 289 pte_t *pte;
290 int referenced = 0; 290 int referenced = 0;
291 291
292 if (!get_mm_counter(mm, rss))
293 goto out;
294 address = vma_address(page, vma); 292 address = vma_address(page, vma);
295 if (address == -EFAULT) 293 if (address == -EFAULT)
296 goto out; 294 goto out;
@@ -517,8 +515,6 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma)
517 pte_t pteval; 515 pte_t pteval;
518 int ret = SWAP_AGAIN; 516 int ret = SWAP_AGAIN;
519 517
520 if (!get_mm_counter(mm, rss))
521 goto out;
522 address = vma_address(page, vma); 518 address = vma_address(page, vma);
523 if (address == -EFAULT) 519 if (address == -EFAULT)
524 goto out; 520 goto out;
@@ -766,8 +762,7 @@ static int try_to_unmap_file(struct page *page)
766 if (vma->vm_flags & (VM_LOCKED|VM_RESERVED)) 762 if (vma->vm_flags & (VM_LOCKED|VM_RESERVED))
767 continue; 763 continue;
768 cursor = (unsigned long) vma->vm_private_data; 764 cursor = (unsigned long) vma->vm_private_data;
769 while (get_mm_counter(vma->vm_mm, rss) && 765 while ( cursor < max_nl_cursor &&
770 cursor < max_nl_cursor &&
771 cursor < vma->vm_end - vma->vm_start) { 766 cursor < vma->vm_end - vma->vm_start) {
772 try_to_unmap_cluster(cursor, &mapcount, vma); 767 try_to_unmap_cluster(cursor, &mapcount, vma);
773 cursor += CLUSTER_SIZE; 768 cursor += CLUSTER_SIZE;