Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[karo-tx-linux.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index c252aae544e9341925bed2cb49ec7b0e3bc7e9d3..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)]++;
        }
 
@@ -1455,7 +1455,7 @@ static int apply_to_pte_range(struct mm_struct *mm, pmd_t *pmd,
        pte_t *pte;
        int err;
        struct page *pmd_page;
-       spinlock_t *ptl = ptl;          /* Suppress gcc warning */
+       spinlock_t *uninitialized_var(ptl);
 
        pte = (mm == &init_mm) ?
                pte_alloc_kernel(pmd, addr) :