From d278b32e8aa7d05a4d861330ad709e8c2df00dda Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Tue, 4 Mar 2008 14:29:04 -0800
Subject: [PATCH] --- yaml --- r: 86815 b: refs/heads/master c:
 6dbf6d3bb955d5a92005b6ecd6ffad2c5b95b963 h: refs/heads/master i:   86813:
 8949d9737a0cedde213e8e0e321d119296ed3fef   86811:
 6f26d2559dbe48a4972a692747b759876284550f   86807:
 1f9fdab96d00903541f61cd0a7dc53ddd375b798   86799:
 7f4a75d59629b3a772697f8899fd7a0d615c246c   86783:
 d60ca20516b72df57f943fbad6f44eff3ad28c04 v: v3

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

diff --git a/[refs] b/[refs]
index dc24f7790cb7..9b8b3683cff3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 427d5416f317681498337ab19218d195edea02d6
+refs/heads/master: 6dbf6d3bb955d5a92005b6ecd6ffad2c5b95b963
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index ce3c9e4492d8..7f8c03ec587c 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -1711,7 +1711,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	}
 	return ret;
 oom_free_new:
-	__free_page(new_page);
+	page_cache_release(new_page);
 oom:
 	if (old_page)
 		page_cache_release(old_page);
@@ -2163,7 +2163,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	page_cache_release(page);
 	goto unlock;
 oom_free_page:
-	__free_page(page);
+	page_cache_release(page);
 oom:
 	return VM_FAULT_OOM;
 }