diff --git a/[refs] b/[refs] index a0e9d9d9d097..1e2a8e44d4f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8757d5fa6b75e8ea906baf0309d49b980e7f9bc9 +refs/heads/master: c38c8db7225465c8d124f38b24d3024decc26bbd diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index dc0d82cf2a1c..de8bc85dc8f3 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -1549,9 +1549,9 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, flush_cache_page(vma, address, pte_pfn(orig_pte)); entry = mk_pte(new_page, vma->vm_page_prot); entry = maybe_mkwrite(pte_mkdirty(entry), vma); + lazy_mmu_prot_update(entry); ptep_establish(vma, address, page_table, entry); update_mmu_cache(vma, address, entry); - lazy_mmu_prot_update(entry); lru_cache_add_active(new_page); page_add_new_anon_rmap(new_page, vma, address);