diff --git a/[refs] b/[refs] index a0680a43f642..d72d2e198f3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1e6098b23bb46e2b488fe9a26f831f867157483 +refs/heads/master: e88dd6c11c5aef74d8b74a062767add53315533b diff --git a/trunk/mm/fremap.c b/trunk/mm/fremap.c index 21b7d0cbc98c..aa30618ec6b2 100644 --- a/trunk/mm/fremap.c +++ b/trunk/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;