Signed-off-by: Dave Hansen --- arch/ppc64/kernel/pSeries_nvram.c | 0 memhotplug-dave/arch/ppc64/mm/init.c | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) diff -puN arch/ppc64/mm/init.c~I-nonlinear-ppc64-dave-hmore arch/ppc64/mm/init.c --- memhotplug/arch/ppc64/mm/init.c~I-nonlinear-ppc64-dave-hmore Thu Aug 5 09:41:14 2004 +++ memhotplug-dave/arch/ppc64/mm/init.c Thu Aug 5 09:41:14 2004 @@ -579,9 +579,6 @@ void __init paging_init(void) unsigned long zholes_size[MAX_NR_ZONES]; unsigned long total_ram = lmb_phys_mem_size(); unsigned long top_pfn = top_of_ram >> PAGE_SHIFT; -#ifdef CONFIG_NONLINEAR - struct page *lmem_map; -#endif printk(KERN_INFO "Top of RAM: 0x%lx, Total RAM: 0x%lx\n", top_of_ram, total_ram); @@ -598,7 +595,9 @@ void __init paging_init(void) free_area_init_node(0, &contig_page_data, zones_size, __pa(PAGE_OFFSET) >> PAGE_SHIFT, zholes_size); +#ifndef CONFIG_NONLINEAR mem_map = contig_page_data.node_mem_map; +#endif } #endif /* CONFIG_DISCONTIGMEM */ diff -puN fs/binfmt_elf.c~I-nonlinear-ppc64-dave-hmore fs/binfmt_elf.c diff -puN arch/ppc64/kernel/pSeries_nvram.c~I-nonlinear-ppc64-dave-hmore arch/ppc64/kernel/pSeries_nvram.c _