diff --git a/[refs] b/[refs] index 5ed372ad63df..56db4bc5df11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad8c2ee801ad7a52d919b478d9b2c7b39a72d295 +refs/heads/master: 9a5b489b870def9a93f5e89dac03ebe136f901db diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 6bc039486e9f..1ecca56e0a48 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -2723,6 +2723,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, if ((flags & FAULT_FLAG_WRITE) && reuse_swap_page(page)) { pte = maybe_mkwrite(pte_mkdirty(pte), vma); flags &= ~FAULT_FLAG_WRITE; + ret |= VM_FAULT_WRITE; exclusive = 1; } flush_icache_page(vma, page);