From 77809a3030071e29b15a88e04c2820f16abe6e23 Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Sat, 3 Sep 2005 15:54:43 -0700 Subject: [PATCH] --- yaml --- r: 6858 b: refs/heads/master c: 839b9685e80592809d6dfdd865986cd1b5ddc2fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/rmap.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8b1a2f0f7bef..e4248b4c5077 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3279ffd97f1b3962e40d3c5f09495ef8320b180b +refs/heads/master: 839b9685e80592809d6dfdd865986cd1b5ddc2fb diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c index facb8cdca665..28c6cf96d3c4 100644 --- a/trunk/mm/rmap.c +++ b/trunk/mm/rmap.c @@ -289,8 +289,6 @@ static int page_referenced_one(struct page *page, pte_t *pte; int referenced = 0; - if (!get_mm_counter(mm, rss)) - goto out; address = vma_address(page, vma); if (address == -EFAULT) goto out; @@ -517,8 +515,6 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma) pte_t pteval; int ret = SWAP_AGAIN; - if (!get_mm_counter(mm, rss)) - goto out; address = vma_address(page, vma); if (address == -EFAULT) goto out; @@ -766,8 +762,7 @@ static int try_to_unmap_file(struct page *page) if (vma->vm_flags & (VM_LOCKED|VM_RESERVED)) continue; cursor = (unsigned long) vma->vm_private_data; - while (get_mm_counter(vma->vm_mm, rss) && - cursor < max_nl_cursor && + while ( cursor < max_nl_cursor && cursor < vma->vm_end - vma->vm_start) { try_to_unmap_cluster(cursor, &mapcount, vma); cursor += CLUSTER_SIZE;