Mike Kravetz wrote:
> Dave/Joel,
>
> I know you were messing around with ppc64 config options the last
> few days. In this patch set, FLATMEM is not an option for ppc64.
> I'm guessing that this is not by design. Or is it? I'll fix it
> up, unless this was intentional.
>
Beat you to it. Fixes a few other things too. Couldn't fix this:
In file included from include/linux/gfp.h:4,
from include/linux/slab.h:15,
from include/linux/percpu.h:4,
from include/linux/sched.h:34,
from arch/ppc64/kernel/asm-offsets.c:18:
include/linux/mmzone.h:401:27: asm/sparsemem.h: No such file or directory
make[1]: *** [arch/ppc64/kernel/asm-offsets.s] Error 1
make: *** [arch/ppc64/kernel/asm-offsets.s] Error 2
Looks like somebody forgot a file :)
Signed-off-by: Joel Schopp <jschopp@xxxxxxxxxxxxxx
-------------- next part --------------
Index: 2.6.12-rc1-mhp1/arch/ppc64/Kconfig
===================================================================
--- 2.6.12-rc1-mhp1.orig/arch/ppc64/Kconfig 2005-03-24 09:49:49.000000000 -0600
+++ 2.6.12-rc1-mhp1/arch/ppc64/Kconfig 2005-03-24 13:39:02.000000000 -0600
@@ -198,6 +198,10 @@ config HMT
This option enables hardware multithreading on RS64 cpus.
pSeries systems p620 and p660 have such a cpu type.
+config ARCH_FLATMEM_ENABLE
+ def_bool y
+ depends on !NUMA
+
config ARCH_DISCONTIGMEM_ENABLE
def_bool y
depends on SMP && PPC_PSERIES
Index: 2.6.12-rc1-mhp1/arch/ppc64/mm/Makefile
===================================================================
--- 2.6.12-rc1-mhp1.orig/arch/ppc64/mm/Makefile 2005-03-24 09:49:49.000000000 -0600
+++ 2.6.12-rc1-mhp1/arch/ppc64/mm/Makefile 2005-03-24 12:35:55.000000000 -0600
@@ -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
Index: 2.6.12-rc1-mhp1/arch/ppc64/mm/init.c
===================================================================
--- 2.6.12-rc1-mhp1.orig/arch/ppc64/mm/init.c 2005-03-24 09:49:49.000000000 -0600
+++ 2.6.12-rc1-mhp1/arch/ppc64/mm/init.c 2005-03-24 14:06:34.000000000 -0600
@@ -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;
Index: 2.6.12-rc1-mhp1/include/asm-ppc64/mmzone.h
===================================================================
--- 2.6.12-rc1-mhp1.orig/include/asm-ppc64/mmzone.h 2005-03-24 09:49:49.000000000 -0600
+++ 2.6.12-rc1-mhp1/include/asm-ppc64/mmzone.h 2005-03-24 14:06:48.000000000 -0600
@@ -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)
@@ -119,6 +119,6 @@ static inline int pa_to_nid(unsigned lon
})
#endif /* CONFIG_SPARSEMEM */
-#endif /* CONFIG_NUMA */
+#endif /* CONFIG_NEED_MULTIPLE_NODES */
#endif /* _ASM_MMZONE_H_ */
