From: Akinobu Mita Subject: [PATCH] xip: fix get_zeroed_page with __GFP_HIGHMEM Date: Tue, 25 Dec 2007 22:21:26 +0900 Message-ID: <20071225132126.GA4800@APFDCB5C> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: akpm@linux-foundation.org, linux-fsdevel@vger.kernel.org, Carsten Otte To: linux-kernel@vger.kernel.org Return-path: Received: from an-out-0708.google.com ([209.85.132.250]:9930 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751746AbXLYNWu (ORCPT ); Tue, 25 Dec 2007 08:22:50 -0500 Received: by an-out-0708.google.com with SMTP id d31so364809and.103 for ; Tue, 25 Dec 2007 05:22:49 -0800 (PST) Content-Disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org List-ID: The use of get_zeroed_page() with __GFP_HIGHMEM is invalid. Use alloc_page() with __GFP_ZERO instead of invalid get_zeroed_page(). (This patch is only compile tested) Cc: Carsten Otte Signed-off-by: Akinobu Mita --- mm/filemap_xip.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) Index: 2.6-git/mm/filemap_xip.c =================================================================== --- 2.6-git.orig/mm/filemap_xip.c +++ 2.6-git/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); } }