From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hellhawk.shadowen.org ([80.68.90.175]:1635 "EHLO hellhawk.shadowen.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1765374AbXHJOmZ (ORCPT ); Fri, 10 Aug 2007 10:42:25 -0400 From: Andy Whitcroft Subject: [PATCH 5/5] vmemmap ia64: convert to new helper based initialisation References: Message-Id: Date: Fri, 10 Aug 2007 15:41:43 +0100 Sender: linux-arch-owner@vger.kernel.org To: Andrew Morton , Christoph Hellwig Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org, Nick Piggin , Christoph Lameter , Mel Gorman , Andy Whitcroft List-ID: Convert over to the new helper initialialisation and Kconfig options. Signed-off-by: Andy Whitcroft --- arch/ia64/Kconfig | 5 +---- arch/ia64/mm/discontig.c | 8 ++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 92d2c2d..66fafbd 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -363,10 +363,7 @@ config ARCH_FLATMEM_ENABLE config ARCH_SPARSEMEM_ENABLE def_bool y depends on ARCH_DISCONTIGMEM_ENABLE - -config SPARSEMEM_VMEMMAP - def_bool y - depends on SPARSEMEM + select SPARSEMEM_VMEMMAP_ENABLE config ARCH_DISCONTIGMEM_DEFAULT def_bool y if (IA64_SGI_SN2 || IA64_GENERIC || IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB) diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 8a5c1c9..05b374c 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c @@ -715,3 +715,11 @@ void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat) scatter_node_data(); } #endif + +#ifdef CONFIG_SPARSEMEM_VMEMMAP +int __meminit vmemmap_populate(struct page *start_page, + unsigned long size, int node) +{ + return vmemmap_populate_basepages(start_page, size, node); +} +#endif