X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Ffremap.c;h=4e3f53dd5fd448d20a23296dfb398dd1d281fee0;hb=06abdfb47ee745a4d79721de24260815ec6bca2b;hp=aa30618ec6b2cd356c57896a2099a3e4b2a5e39c;hpb=cdb8355add9b1d87ecfcb58b12879897dc1e3e36;p=powerpc.git

diff --git a/mm/fremap.c b/mm/fremap.c
index aa30618ec6..4e3f53dd5f 100644
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -33,13 +33,13 @@ static int zap_pte(struct mm_struct *mm, struct vm_area_struct *vma,
 		if (page) {
 			if (pte_dirty(pte))
 				set_page_dirty(page);
-			page_remove_rmap(page);
+			page_remove_rmap(page, vma);
 			page_cache_release(page);
 		}
 	} else {
 		if (!pte_file(pte))
 			free_swap_and_cache(pte_to_swp_entry(pte));
-		pte_clear(mm, addr, ptep);
+		pte_clear_not_present_full(mm, addr, ptep, 0);
 	}
 	return !!page;
 }
@@ -101,7 +101,6 @@ int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma,
 {
 	int err = -ENOMEM;
 	pte_t *pte;
-	pte_t pte_val;
 	spinlock_t *ptl;
 
 	pte = get_locked_pte(mm, addr, &ptl);
@@ -114,7 +113,6 @@ int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma,
 	}
 
 	set_pte_at(mm, addr, pte, pgoff_to_pte(pgoff));
-	pte_val = *pte;
 	/*
 	 * We don't need to run update_mmu_cache() here because the "file pte"
 	 * being installed by install_file_pte() is not a real pte - it's a