From: Joel Schopp <jschopp@austin.ibm.com>
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 memhotplug-dave/arch/ppc64/Kconfig         |    4 ++++
 memhotplug-dave/arch/ppc64/mm/Makefile     |    2 +-
 memhotplug-dave/arch/ppc64/mm/init.c       |    4 ++--
 memhotplug-dave/include/asm-ppc64/mmzone.h |    4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff -puN arch/ppc64/Kconfig~B-sparse-171-ppc64-fix-defconfig arch/ppc64/Kconfig
--- memhotplug/arch/ppc64/Kconfig~B-sparse-171-ppc64-fix-defconfig	2005-04-13 14:20:22.000000000 -0700
+++ memhotplug-dave/arch/ppc64/Kconfig	2005-04-13 14:20:22.000000000 -0700
@@ -201,6 +201,10 @@ config HMT
 config ARCH_SELECT_MEMORY_MODEL
 	def_bool y
 
+config ARCH_FLATMEM_ENABLE
+       def_bool y
+       depends on !NUMA
+
 config ARCH_DISCONTIGMEM_ENABLE
 	def_bool y
 	depends on SMP && PPC_PSERIES
diff -puN arch/ppc64/mm/Makefile~B-sparse-171-ppc64-fix-defconfig arch/ppc64/mm/Makefile
--- memhotplug/arch/ppc64/mm/Makefile~B-sparse-171-ppc64-fix-defconfig	2005-04-13 14:20:22.000000000 -0700
+++ memhotplug-dave/arch/ppc64/mm/Makefile	2005-04-13 14:20:22.000000000 -0700
@@ -6,6 +6,6 @@ EXTRA_CFLAGS += -mno-minimal-toc
 
 obj-y := fault.o init.o imalloc.o hash_utils.o hash_low.o tlb.o \
 	slb_low.o slb.o stab.o mmap.o
-obj-$(CONFIG_NUMA) += numa.o
+obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
 obj-$(CONFIG_PPC_MULTIPLATFORM) += hash_native.o
diff -puN arch/ppc64/mm/init.c~B-sparse-171-ppc64-fix-defconfig arch/ppc64/mm/init.c
--- memhotplug/arch/ppc64/mm/init.c~B-sparse-171-ppc64-fix-defconfig	2005-04-13 14:20:22.000000000 -0700
+++ memhotplug-dave/arch/ppc64/mm/init.c	2005-04-13 14:20:22.000000000 -0700
@@ -601,7 +601,7 @@ EXPORT_SYMBOL(page_is_ram);
  * Initialize the bootmem system and give it all the memory we
  * have available.
  */
-#ifndef CONFIG_NUMA
+#ifndef CONFIG_NEED_MULTIPLE_NODES
 void __init do_init_bootmem(void)
 {
 	unsigned long i;
@@ -681,7 +681,7 @@ void __init paging_init(void)
 	free_area_init_node(0, &contig_page_data, zones_size,
 			    __pa(PAGE_OFFSET) >> PAGE_SHIFT, zholes_size);
 }
-#endif /* ! CONFIG_NUMA */
+#endif /* ! CONFIG_NEED_MULTIPLE_NODES */
 
 static struct kcore_list kcore_vmem;
 
diff -puN include/asm-ppc64/mmzone.h~B-sparse-171-ppc64-fix-defconfig include/asm-ppc64/mmzone.h
--- memhotplug/include/asm-ppc64/mmzone.h~B-sparse-171-ppc64-fix-defconfig	2005-04-13 14:20:22.000000000 -0700
+++ memhotplug-dave/include/asm-ppc64/mmzone.h	2005-04-13 14:20:22.000000000 -0700
@@ -25,7 +25,7 @@
 #define MAX_PHYSADDR_BITS       38
 #define MAX_PHYSMEM_BITS        36
 
-#if defined(CONFIG_NUMA)
+#if defined(CONFIG_NEED_MULTIPLE_NODES)
 
 #if defined(CONFIG_DISCONTIGMEM) || defined(CONFIG_SPARSEMEM)
 
@@ -118,7 +118,7 @@ static inline int pa_to_nid(unsigned lon
 })
 #endif /* CONFIG_SPARSEMEM */
 
-#endif /* CONFIG_NUMA */
+#endif /* CONFIG_NEED_MULTIPLE_NODES */
 
 #ifdef CONFIG_NEED_MULTIPLE_NODES
 #define early_pfn_to_nid(pfn)  pa_to_nid(((unsigned long)pfn) << PAGE_SHIFT)
_