From 0c95a507cb299511c982791cdf1b330598c4a8a4 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Tue, 8 Jan 2008 15:32:57 -0800 Subject: [PATCH] --- yaml --- r: 75303 b: refs/heads/master c: c51b1a160b63304720d49479986915e4c475a2cf h: refs/heads/master i: 75301: 9069650e0a62f0393f9f00118c11b84b72b96609 75299: 4a6fef5ddda9a40fa424a661923124b8997e1bed 75295: 52538eff62db0f6ae5164234746dd3a22bcd20f0 v: v3 --- [refs] | 2 +- trunk/mm/filemap_xip.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ecd40861a1d9..f52ed0255bf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f94e87cdeaaac9f0f9a28a5dd2a5070b87cd3e8 +refs/heads/master: c51b1a160b63304720d49479986915e4c475a2cf diff --git a/trunk/mm/filemap_xip.c b/trunk/mm/filemap_xip.c index e233fff61b4b..f874ae818ad3 100644 --- a/trunk/mm/filemap_xip.c +++ b/trunk/mm/filemap_xip.c @@ -25,14 +25,15 @@ static struct page *__xip_sparse_page; static struct page *xip_sparse_page(void) { if (!__xip_sparse_page) { - unsigned long zeroes = get_zeroed_page(GFP_HIGHUSER); - if (zeroes) { + struct page *page = alloc_page(GFP_HIGHUSER | __GFP_ZERO); + + if (page) { static DEFINE_SPINLOCK(xip_alloc_lock); spin_lock(&xip_alloc_lock); if (!__xip_sparse_page) - __xip_sparse_page = virt_to_page(zeroes); + __xip_sparse_page = page; else - free_page(zeroes); + __free_page(page); spin_unlock(&xip_alloc_lock); } }