From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755908Ab0AVDak (ORCPT ); Thu, 21 Jan 2010 22:30:40 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755918Ab0AVDag (ORCPT ); Thu, 21 Jan 2010 22:30:36 -0500 Received: from mga03.intel.com ([143.182.124.21]:51569 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755908Ab0AVDaf (ORCPT ); Thu, 21 Jan 2010 22:30:35 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,316,1257148800"; d="scan'208";a="235568034" Message-Id: <20100122033004.193166010@intel.com> User-Agent: quilt/0.48-1 Date: Fri, 22 Jan 2010 11:21:03 +0800 From: Wu Fengguang cc: Andrew Morton , Chen Liqin , Lennox Wu , Ralf Baechle , =?UTF-8?q?Am=C3=A9rico=20Wang?= , linux-mips@linux-mips.org, KAMEZAWA Hiroyuki , Yinghai Lu , Wu Fengguang To: Thomas Gleixner To: Ingo Molnar To: "H. Peter Anvin" cc: x86@kernel.org Cc: LKML cc: Andi Kleen , shaohui.zheng@intel.com Subject: [PATCH 1/3] resources: introduce generic page_is_ram() References: <20100122032102.137106635@intel.com> Content-Disposition: inline; filename=page-is-ram.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's based on walk_system_ram_range(), for archs that don't have their own page_is_ram(). The static verions in MIPS and SCORE are also made global. CC: Chen Liqin CC: Lennox Wu CC: Ralf Baechle CC: Américo Wang CC: linux-mips@linux-mips.org CC: KAMEZAWA Hiroyuki CC: Yinghai Lu Signed-off-by: Wu Fengguang --- arch/mips/mm/init.c | 2 +- arch/score/mm/init.c | 2 +- include/linux/ioport.h | 2 ++ kernel/resource.c | 11 +++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) --- linux-mm.orig/kernel/resource.c 2010-01-22 11:20:34.000000000 +0800 +++ linux-mm/kernel/resource.c 2010-01-22 11:20:35.000000000 +0800 @@ -327,6 +327,17 @@ int walk_system_ram_range(unsigned long #endif +#define PAGE_IS_RAM 24 +static int __is_ram(unsigned long pfn, unsigned long nr_pages, void *arg) +{ + return PAGE_IS_RAM; +} +int __attribute__((weak)) page_is_ram(unsigned long pfn) +{ + return PAGE_IS_RAM == walk_system_ram_range(pfn, 1, NULL, __is_ram); +} +#undef PAGE_IS_RAM + /* * Find empty slot in the resource tree given range and alignment. */ --- linux-mm.orig/include/linux/ioport.h 2010-01-22 11:20:34.000000000 +0800 +++ linux-mm/include/linux/ioport.h 2010-01-22 11:20:35.000000000 +0800 @@ -191,5 +191,7 @@ extern int walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages, void *arg, int (*func)(unsigned long, unsigned long, void *)); +extern int page_is_ram(unsigned long pfn); + #endif /* __ASSEMBLY__ */ #endif /* _LINUX_IOPORT_H */ --- linux-mm.orig/arch/score/mm/init.c 2010-01-22 11:20:34.000000000 +0800 +++ linux-mm/arch/score/mm/init.c 2010-01-22 11:20:35.000000000 +0800 @@ -59,7 +59,7 @@ static unsigned long setup_zero_page(voi } #ifndef CONFIG_NEED_MULTIPLE_NODES -static int __init page_is_ram(unsigned long pagenr) +int page_is_ram(unsigned long pagenr) { if (pagenr >= min_low_pfn && pagenr < max_low_pfn) return 1; --- linux-mm.orig/arch/mips/mm/init.c 2010-01-22 11:20:34.000000000 +0800 +++ linux-mm/arch/mips/mm/init.c 2010-01-22 11:20:35.000000000 +0800 @@ -298,7 +298,7 @@ void __init fixrange_init(unsigned long } #ifndef CONFIG_NEED_MULTIPLE_NODES -static int __init page_is_ram(unsigned long pagenr) +int page_is_ram(unsigned long pagenr) { int i;