From e203f84efd4ccfdd5472bc896fe9d0be04090c8b Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Tue, 15 May 2007 23:57:09 -0700
Subject: [PATCH] --- yaml --- r: 56482 b: refs/heads/master c:
 43c0f3d25c602dc96b201ed81ffda0bc600ff969 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c9675c01a89a..2c25fd5d87f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8382d2b9a7205fe1fb262f59237715a40c911880
+refs/heads/master: 43c0f3d25c602dc96b201ed81ffda0bc600ff969
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index 7b48b2ad00e7..edb1b0b5cc8d 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -670,7 +670,8 @@ struct page *find_or_create_page(struct address_space *mapping,
 	page = find_lock_page(mapping, index);
 	if (!page) {
 		if (!cached_page) {
-			cached_page = alloc_page(gfp_mask);
+			cached_page =
+				__page_cache_alloc(gfp_mask);
 			if (!cached_page)
 				return NULL;
 		}