From 96b6e6ea515100855b01ae213a5237996adf16d6 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Sat, 3 Sep 2005 15:54:47 -0700 Subject: [PATCH] --- yaml --- r: 6861 b: refs/heads/master c: 2822c1aa574d277b9ba0130b1e71c1a5874bc04a h: refs/heads/master i: 6859: 08b7af5af37e48f58d5e296d586327eecda5b278 v: v3 --- [refs] | 2 +- trunk/mm/rmap.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index f414d7035df7..537c831a0c8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3dce2d89c269d5373a120d4a22fc2426ec992b0 +refs/heads/master: 2822c1aa574d277b9ba0130b1e71c1a5874bc04a diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c index f5a6966b7eb0..7e975ca24c78 100644 --- a/trunk/mm/rmap.c +++ b/trunk/mm/rmap.c @@ -439,22 +439,23 @@ int page_referenced(struct page *page, int is_locked, int ignore_token) void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address) { - struct anon_vma *anon_vma = vma->anon_vma; - pgoff_t index; - BUG_ON(PageReserved(page)); - BUG_ON(!anon_vma); inc_mm_counter(vma->vm_mm, anon_rss); - anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON; - index = (address - vma->vm_start) >> PAGE_SHIFT; - index += vma->vm_pgoff; - index >>= PAGE_CACHE_SHIFT - PAGE_SHIFT; - if (atomic_inc_and_test(&page->_mapcount)) { - page->index = index; + struct anon_vma *anon_vma = vma->anon_vma; + pgoff_t index; + + BUG_ON(!anon_vma); + anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON; page->mapping = (struct address_space *) anon_vma; + + index = (address - vma->vm_start) >> PAGE_SHIFT; + index += vma->vm_pgoff; + index >>= PAGE_CACHE_SHIFT - PAGE_SHIFT; + page->index = index; + inc_page_state(nr_mapped); } /* else checking page index and mapping is racy */