From 1a1efb8c63c754c877d4c6caf9e6f69ad3ab4fbd Mon Sep 17 00:00:00 2001
From: Dominik Dingel <dingel@linux.vnet.ibm.com>
Date: Wed, 12 Dec 2012 13:52:37 -0800
Subject: [PATCH] --- yaml --- r: 343349 b: refs/heads/master c:
 66521d5aa6c0f74b5e90c21569acbaa8c5ac0998 h: refs/heads/master i:   343347:
 03cc5666303b616ad18b63aa614681f1962a1f5e v: v3

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

diff --git a/[refs] b/[refs]
index 85c3b5189e55..20ca688da784 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 816422ad76474fed8052b6f7b905a054d082e59a
+refs/heads/master: 66521d5aa6c0f74b5e90c21569acbaa8c5ac0998
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 3f680e7c7645..db2e9e797a05 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -2780,13 +2780,8 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
 oom_free_new:
 	page_cache_release(new_page);
 oom:
-	if (old_page) {
-		if (page_mkwrite) {
-			unlock_page(old_page);
-			page_cache_release(old_page);
-		}
+	if (old_page)
 		page_cache_release(old_page);
-	}
 	return VM_FAULT_OOM;
 
 unwritable_page: