X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Ffremap.c;h=7a9d0f5d246da922c132738f2476a688812fc1ac;hb=9300abd4c60d385683944b9bc5cbf2c7c2cc6e78;hp=21b7d0cbc98c6eed4c859cebc825ee2c3d715ee1;hpb=816724e65c72a90a44fbad0ef0b59b186c85fa90;p=powerpc.git

diff --git a/mm/fremap.c b/mm/fremap.c
index 21b7d0cbc9..7a9d0f5d24 100644
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -39,7 +39,7 @@ static int zap_pte(struct mm_struct *mm, struct vm_area_struct *vma,
 	} 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;
 }
@@ -79,9 +79,9 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		inc_mm_counter(mm, file_rss);
 
 	flush_icache_page(vma, page);
-	set_pte_at(mm, addr, pte, mk_pte(page, prot));
+	pte_val = mk_pte(page, prot);
+	set_pte_at(mm, addr, pte, pte_val);
 	page_add_file_rmap(page);
-	pte_val = *pte;
 	update_mmu_cache(vma, addr, pte_val);
 	lazy_mmu_prot_update(pte_val);
 	err = 0;