From 6334c860a74d0971c5e0bc4ea5122bb560c1a1b8 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Date: Mon, 21 Sep 2009 17:01:59 -0700
Subject: [PATCH] --- yaml --- r: 164403 b: refs/heads/master c:
 21333b2b66b805a360641568588e5a0bb06d9d1f h: refs/heads/master i:   164401:
 3c5e8da74bf1dfe5aab02594119375d62edd84a4   164399:
 0a32c19775daea6c10f4c975b4ee8bd3ae78a5b8 v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/rmap.h |  6 +-----
 trunk/mm/memory.c          |  2 +-
 trunk/mm/rmap.c            | 21 ---------------------
 4 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 964095b8abdf..f8033284064e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8af4da3b4c14e7267c4ffb952079af3912c51c5
+refs/heads/master: 21333b2b66b805a360641568588e5a0bb06d9d1f
diff --git a/trunk/include/linux/rmap.h b/trunk/include/linux/rmap.h
index bf116d0dbf23..477841d29fce 100644
--- a/trunk/include/linux/rmap.h
+++ b/trunk/include/linux/rmap.h
@@ -71,14 +71,10 @@ void page_add_new_anon_rmap(struct page *, struct vm_area_struct *, unsigned lon
 void page_add_file_rmap(struct page *);
 void page_remove_rmap(struct page *);
 
-#ifdef CONFIG_DEBUG_VM
-void page_dup_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address);
-#else
-static inline void page_dup_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address)
+static inline void page_dup_rmap(struct page *page)
 {
 	atomic_inc(&page->_mapcount);
 }
-#endif
 
 /*
  * Called from mm/vmscan.c to handle paging out
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 368561f32009..7a61a11f1867 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -597,7 +597,7 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 	page = vm_normal_page(vma, addr, pte);
 	if (page) {
 		get_page(page);
-		page_dup_rmap(page, vma, addr);
+		page_dup_rmap(page);
 		rss[!!PageAnon(page)]++;
 	}
 
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
index 1406e67f9613..720fc03a7bc4 100644
--- a/trunk/mm/rmap.c
+++ b/trunk/mm/rmap.c
@@ -710,27 +710,6 @@ void page_add_file_rmap(struct page *page)
 	}
 }
 
-#ifdef CONFIG_DEBUG_VM
-/**
- * page_dup_rmap - duplicate pte mapping to a page
- * @page:	the page to add the mapping to
- * @vma:	the vm area being duplicated
- * @address:	the user virtual address mapped
- *
- * For copy_page_range only: minimal extract from page_add_file_rmap /
- * page_add_anon_rmap, avoiding unnecessary tests (already checked) so it's
- * quicker.
- *
- * The caller needs to hold the pte lock.
- */
-void page_dup_rmap(struct page *page, struct vm_area_struct *vma, unsigned long address)
-{
-	if (PageAnon(page))
-		__page_check_anon_rmap(page, vma, address);
-	atomic_inc(&page->_mapcount);
-}
-#endif
-
 /**
  * page_remove_rmap - take down pte mapping from a page
  * @page: page to remove mapping from