diff --git a/[refs] b/[refs] index 91432e5f373c..bc9ef495e480 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d44ed4f86892e350f4b16a3489b7e7c1a9bb7ead +refs/heads/master: 4944e76d81801b8e60ed3e7789443f210c16ed65 diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index a596c1172248..b25f5e58a14c 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -1955,7 +1955,7 @@ static int do_file_page(struct mm_struct * mm, struct vm_area_struct * vma, * Fall back to the linear mapping if the fs does not support * ->populate: */ - if (!vma->vm_ops || !vma->vm_ops->populate || + if (!vma->vm_ops->populate || (write_access && !(vma->vm_flags & VM_SHARED))) { pte_clear(mm, address, pte); return do_no_page(mm, vma, address, write_access, pte, pmd);