Merge branch 'master' into gfs2

1 files changed, 2 insertions, 2 deletions

diff --git a/mm/fremap.c b/mm/fremap.c
index 21b7d0cbc98c..aa30618ec6b2 100644
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -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;