From 02b89962357ca635717987830dd1bf3b71651844 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Sat, 29 Oct 2005 18:16:15 -0700
Subject: [PATCH] --- yaml --- r: 11349 b: refs/heads/master c:
 9e9bef07ce5a342aa6246ebc5c20829d0d5d63d0 h: refs/heads/master i:   11347:
 cda6cda80bf446524bff9c7a347687a5d17e5a2a v: v3

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

diff --git a/[refs] b/[refs]
index 3b880df080a3..62b409c5a92f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86d912f41dca32eca8827f2f878139735e69dc28
+refs/heads/master: 9e9bef07ce5a342aa6246ebc5c20829d0d5d63d0
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index bc6296398f8b..a25ee1d3e20a 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -1728,10 +1728,8 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	 */
 	spin_lock(&mm->page_table_lock);
 	page_table = pte_offset_map(pmd, address);
-	if (unlikely(!pte_same(*page_table, orig_pte))) {
-		ret = VM_FAULT_MINOR;
+	if (unlikely(!pte_same(*page_table, orig_pte)))
 		goto out_nomap;
-	}
 
 	if (unlikely(!PageUptodate(page))) {
 		ret = VM_FAULT_SIGBUS;