---

yaml --- r: 6862 b: refs/heads/master c: 4d7670e h: refs/heads/master v: v3
git-mirror · Sep 5, 2005 · dfaffb3 · dfaffb3
1 parent 96b6e6e
commit dfaffb3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2822c1aa574d277b9ba0130b1e71c1a5874bc04a
+refs/heads/master: 4d7670e0f649f9e6e6ea6c8bb9f52441fa00f92b
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
@@ -445,16 +445,12 @@ void page_add_anon_rmap(struct page *page,
 
 	if (atomic_inc_and_test(&page->_mapcount)) {
 		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;
+		page->index = linear_page_index(vma, address);
 
 		inc_page_state(nr_mapped);
 	}