Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

[mv-sheeva.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 1d647ab0ee72d02f8ad735273d46b862b3fbcee9..cb94488ab96dad4eb3840fa037a7b08673154674 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -481,7 +481,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);
+               page_dup_rmap(page, vma, addr);
                rss[!!PageAnon(page)]++;
        }