Convert over to the new Kconfig options.
Signed-off-by: Andy Whitcroft <[EMAIL PROTECTED]>
---
arch/sparc64/Kconfig | 9 +--------
arch/sparc64/mm/init.c | 4 ++--
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 9953b4e..59c4d75 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -240,20 +240,13 @@ config ARCH_SELECT_MEMORY_MODEL
config ARCH_SPARSEMEM_ENABLE
def_bool y
+ select SPARSEMEM_VMEMMAP_ENABLE
config ARCH_SPARSEMEM_DEFAULT
def_bool y
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 ISA
bool
help
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 19cac53..4e1df9a 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -1655,7 +1655,7 @@ EXPORT_SYMBOL(_PAGE_E);
unsigned long _PAGE_CACHE __read_mostly;
EXPORT_SYMBOL(_PAGE_CACHE);
-#ifdef CONFIG_ARCH_POPULATES_SPARSEMEM_VMEMMAP
+#ifdef CONFIG_SPARSEMEM_VMEMMAP
#define VMEMMAP_CHUNK_SHIFT 22
#define VMEMMAP_CHUNK (1UL << VMEMMAP_CHUNK_SHIFT)
@@ -1705,7 +1705,7 @@ int __meminit vmemmap_populate(struct page *start,
unsigned long nr, int node)
}
return 0;
}
-#endif /* CONFIG_ARCH_POPULATES_SPARSEMEM_VMEMMAP */
+#endif /* CONFIG_SPARSEMEM_VMEMMAP */
static void prot_init_common(unsigned long page_none,
unsigned long page_shared,
-
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
