Signed-off-by: Dave Hansen --- memhotplug-dave/arch/ppc64/kernel/smp.c | 3 ++- memhotplug-dave/arch/ppc64/mm/init.c | 3 --- 2 files changed, 2 insertions(+), 4 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 2004-08-20 11:28:15.000000000 -0700 +++ memhotplug-dave/arch/ppc64/mm/init.c 2004-08-20 11:28:15.000000000 -0700 @@ -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); 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 diff -puN arch/ppc64/kernel/smp.c~I-nonlinear-ppc64-dave-hmore arch/ppc64/kernel/smp.c --- memhotplug/arch/ppc64/kernel/smp.c~I-nonlinear-ppc64-dave-hmore 2004-08-20 11:28:15.000000000 -0700 +++ memhotplug-dave/arch/ppc64/kernel/smp.c 2004-08-20 11:28:15.000000000 -0700 @@ -373,7 +373,7 @@ static inline int __devinit smp_startup_ { int status; extern void (*pseries_secondary_smp_init)(unsigned int cpu); - unsigned long start_here = __pa(pseries_secondary_smp_init); + unsigned long start_here; unsigned int pcpu; /* At boot time the cpus are already spinning in hold @@ -393,6 +393,7 @@ static inline int __devinit smp_startup_ /* At boot this is done in prom.c. */ paca[lcpu].hw_cpu_id = pcpu; + start_here = __pa(pseries_secondary_smp_init); status = rtas_call(rtas_token("start-cpu"), 3, 1, NULL, pcpu, start_here, lcpu); if (status != 0) { _