From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755544Ab0AMOBU (ORCPT ); Wed, 13 Jan 2010 09:01:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755408Ab0AMOAk (ORCPT ); Wed, 13 Jan 2010 09:00:40 -0500 Received: from mga09.intel.com ([134.134.136.24]:2699 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755412Ab0AMOAj (ORCPT ); Wed, 13 Jan 2010 09:00:39 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.49,268,1262592000"; d="scan'208";a="483648896" Message-Id: <20100113135957.680223335@intel.com> User-Agent: quilt/0.48-1 Date: Wed, 13 Jan 2010 21:53:09 +0800 From: Wu Fengguang To: Andrew Morton Cc: Wu Fengguang , LKML , Chen Liqin , Lennox Wu , Ralf Baechle , linux-mips@linux-mips.org, KAMEZAWA Hiroyuki CC: Andi Kleen CC: Nick Piggin CC: Hugh Dickins cc: Linux Memory Management List Subject: [PATCH 4/8] resources: introduce generic page_is_ram() References: <20100113135305.013124116@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: linux-mips@linux-mips.org CC: KAMEZAWA Hiroyuki 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 | 10 ++++++++++ 4 files changed, 14 insertions(+), 2 deletions(-) --- linux-mm.orig/kernel/resource.c 2010-01-10 10:11:53.000000000 +0800 +++ linux-mm/kernel/resource.c 2010-01-10 10:15:33.000000000 +0800 @@ -297,6 +297,16 @@ int walk_system_ram_range(unsigned long #endif +static int __is_ram(unsigned long pfn, unsigned long nr_pages, void *arg) +{ + return 24; +} + +int __attribute__((weak)) page_is_ram(unsigned long pfn) +{ + return 24 == walk_system_ram_range(pfn, 1, NULL, __is_ram); +} + /* * Find empty slot in the resource tree given range and alignment. */ --- linux-mm.orig/include/linux/ioport.h 2010-01-10 10:11:53.000000000 +0800 +++ linux-mm/include/linux/ioport.h 2010-01-10 10:11:54.000000000 +0800 @@ -188,5 +188,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-10 10:35:38.000000000 +0800 +++ linux-mm/arch/score/mm/init.c 2010-01-10 10:38:04.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-10 10:37:22.000000000 +0800 +++ linux-mm/arch/mips/mm/init.c 2010-01-10 10:37:26.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;