From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hellhawk.shadowen.org ([80.68.90.175]:1621 "EHLO hellhawk.shadowen.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759690AbXHJOlk (ORCPT ); Fri, 10 Aug 2007 10:41:40 -0400 From: Andy Whitcroft Subject: [PATCH 3/5] vmemmap ppc64: convert to new config options References: Message-Id: Date: Fri, 10 Aug 2007 15:41:02 +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 Kconfig options. Signed-off-by: Andy Whitcroft --- arch/powerpc/Kconfig | 9 +-------- arch/powerpc/mm/init_64.c | 3 +-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index f5124cf..111bc25 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -265,6 +265,7 @@ config ARCH_FLATMEM_ENABLE config ARCH_SPARSEMEM_ENABLE def_bool y depends on PPC64 + select SPARSEMEM_VMEMMAP_ENABLE config ARCH_SPARSEMEM_DEFAULT def_bool y @@ -275,14 +276,6 @@ config ARCH_POPULATES_NODE_MAP source "mm/Kconfig" -config SPARSEMEM_VMEMMAP - def_bool y - depends on SPARSEMEM - -config ARCH_POPULATES_SPARSEMEM_VMEMMAP - def_bool y - depends on SPARSEMEM_VMEMMAP - config ARCH_MEMORY_PROBE def_bool y depends on MEMORY_HOTPLUG diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 05c7e93..4f543f8 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -182,8 +182,7 @@ void pgtable_cache_init(void) } } -#ifdef CONFIG_ARCH_POPULATES_SPARSEMEM_VMEMMAP - +#ifdef CONFIG_SPARSEMEM_VMEMMAP /* * Given an address within the vmemmap, determine the pfn of the page that * represents the start of the section it is within. Note that we have to