This patch pulls against 2.6.11 out all remaining direct references to contig_page_data from arch/x86-64, thus saving an ifdef in one case. It also deletes a duplicate node_mem_map() macro asm-x86-64/mmzone.h. Signed-off-by: Matt Tolentino Signed-off-by: Dave Hansen --- include/asm-x86_64/mmzone.h | 0 memhotplug-dave/arch/x86_64/kernel/aperture.c | 4 ---- memhotplug-dave/arch/x86_64/kernel/setup.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff -puN arch/x86_64/kernel/aperture.c~B-sparse-190-x86_64-a-trivial_fixes-take2 arch/x86_64/kernel/aperture.c --- memhotplug/arch/x86_64/kernel/aperture.c~B-sparse-190-x86_64-a-trivial_fixes-take2 2005-04-13 14:20:32.000000000 -0700 +++ memhotplug-dave/arch/x86_64/kernel/aperture.c 2005-04-13 14:20:32.000000000 -0700 @@ -40,11 +40,7 @@ int fix_aperture __initdata = 1; static u32 __init allocate_aperture(void) { -#ifdef CONFIG_DISCONTIGMEM pg_data_t *nd0 = NODE_DATA(0); -#else - pg_data_t *nd0 = &contig_page_data; -#endif u32 aper_size; void *p; diff -puN arch/x86_64/kernel/setup.c~B-sparse-190-x86_64-a-trivial_fixes-take2 arch/x86_64/kernel/setup.c --- memhotplug/arch/x86_64/kernel/setup.c~B-sparse-190-x86_64-a-trivial_fixes-take2 2005-04-13 14:20:32.000000000 -0700 +++ memhotplug-dave/arch/x86_64/kernel/setup.c 2005-04-13 14:20:32.000000000 -0700 @@ -385,7 +385,7 @@ static void __init contig_initmem_init(v if (bootmap == -1L) panic("Cannot find bootmem map of size %ld\n",bootmap_size); bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn); - e820_bootmem_free(&contig_page_data, 0, end_pfn << PAGE_SHIFT); + e820_bootmem_free(NODE_DATA(0), 0, end_pfn << PAGE_SHIFT); reserve_bootmem(bootmap, bootmap_size); } #endif diff -puN include/asm-x86_64/mmzone.h~B-sparse-190-x86_64-a-trivial_fixes-take2 include/asm-x86_64/mmzone.h _