This moves a few things out from under #ifndef DISCONTIG to #ifndef NEED_MULTIPLE_NODES. These are things that are needed for NUMA or for DISCONTIG. You run into the problem when SPARSE=y, NUMA=y, and DISCONITG=n. Signed-off-by: Dave Hansen --- memhotplug-dave/arch/i386/kernel/setup.c | 4 +- memhotplug-dave/include/asm-i386/mmzone.h | 46 ++++++++++++++++-------------- 2 files changed, 27 insertions(+), 23 deletions(-) diff -puN include/asm-i386/mmzone.h~B-sparse-162-i386-mmzone-use-NEED_NODES include/asm-i386/mmzone.h --- memhotplug/include/asm-i386/mmzone.h~B-sparse-162-i386-mmzone-use-NEED_NODES 2005-04-13 14:20:18.000000000 -0700 +++ memhotplug-dave/include/asm-i386/mmzone.h 2005-04-13 14:20:18.000000000 -0700 @@ -70,26 +70,6 @@ static inline int pfn_to_nid(unsigned lo #endif } -/* - * Following are macros that are specific to this numa platform. - */ -#define reserve_bootmem(addr, size) \ - reserve_bootmem_node(NODE_DATA(0), (addr), (size)) -#define alloc_bootmem(x) \ - __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) -#define alloc_bootmem_low(x) \ - __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, 0) -#define alloc_bootmem_pages(x) \ - __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) -#define alloc_bootmem_low_pages(x) \ - __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0) -#define alloc_bootmem_node(ignore, x) \ - __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) -#define alloc_bootmem_pages_node(ignore, x) \ - __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) -#define alloc_bootmem_low_pages_node(ignore, x) \ - __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0) - #define node_localnr(pfn, nid) ((pfn) - node_data[nid]->node_start_pfn) /* @@ -143,8 +123,32 @@ static inline int pfn_valid(int pfn) return (pfn < node_end_pfn(nid)); return 0; } -#endif +#endif /* CONFIG_X86_NUMAQ */ #endif /* CONFIG_DISCONTIGMEM */ +#ifdef CONFIG_NEED_MULTIPLE_NODES + +/* + * Following are macros that are specific to this numa platform. + */ +#define reserve_bootmem(addr, size) \ + reserve_bootmem_node(NODE_DATA(0), (addr), (size)) +#define alloc_bootmem(x) \ + __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) +#define alloc_bootmem_low(x) \ + __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, 0) +#define alloc_bootmem_pages(x) \ + __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) +#define alloc_bootmem_low_pages(x) \ + __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0) +#define alloc_bootmem_node(ignore, x) \ + __alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS)) +#define alloc_bootmem_pages_node(ignore, x) \ + __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS)) +#define alloc_bootmem_low_pages_node(ignore, x) \ + __alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0) + +#endif /* CONFIG_NEED_MULTIPLE_NODES */ + #endif /* _ASM_MMZONE_H_ */ diff -puN arch/i386/kernel/setup.c~B-sparse-162-i386-mmzone-use-NEED_NODES arch/i386/kernel/setup.c --- memhotplug/arch/i386/kernel/setup.c~B-sparse-162-i386-mmzone-use-NEED_NODES 2005-04-13 14:20:18.000000000 -0700 +++ memhotplug-dave/arch/i386/kernel/setup.c 2005-04-13 14:20:18.000000000 -0700 @@ -1023,7 +1023,7 @@ static void __init reserve_ebda_region(v reserve_bootmem(addr, PAGE_SIZE); } -#ifndef CONFIG_DISCONTIGMEM +#ifndef CONFIG_NEED_MULTIPLE_NODES void __init setup_bootmem_allocator(void); static unsigned long __init setup_memory(void) { @@ -1075,7 +1075,7 @@ void __init zone_sizes_init(void) #else extern unsigned long __init setup_memory(void); extern void zone_sizes_init(void); -#endif /* !CONFIG_DISCONTIGMEM */ +#endif /* !CONFIG_NEED_MULTIPLE_NODES */ void __init setup_bootmem_allocator(void) { diff -L include/asm-ia64/sparsemem.h -puN /dev/null /dev/null _