Convert over to the new Kconfig options.
Signed-off-by: Andy Whitcroft <[EMAIL PROTECTED]>
---
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
-
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
