From 8d9ae0fb2d24b4ecf80b107c6fbfd838e2e2c9fa Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <aarcange@redhat.com>
Date: Mon, 9 Aug 2010 17:19:49 -0700
Subject: [PATCH] --- yaml --- r: 207267 b: refs/heads/master c:
 9a5b489b870def9a93f5e89dac03ebe136f901db h: refs/heads/master i:   207265:
 630fd027e9906f5a64bb913e6c11f51efd2cca07   207263:
 c27daef788edfcf74bc1d7b15597f523ccbf3109 v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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);