Signed-off-by: Dave Hansen --- memhotplug-dave/arch/ppc64/kernel/chrp_setup.c | 4 ++-- memhotplug-dave/arch/ppc64/mm/init.c | 3 ++- memhotplug-dave/mm/page_alloc.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff -puN arch/ppc64/mm/init.c~I3-nonlinear-types arch/ppc64/mm/init.c --- memhotplug/arch/ppc64/mm/init.c~I3-nonlinear-types 2004-08-20 11:28:18.000000000 -0700 +++ memhotplug-dave/arch/ppc64/mm/init.c 2004-08-20 11:28:18.000000000 -0700 @@ -601,7 +601,8 @@ void __init paging_init(void) #endif free_area_init_node(0, &contig_page_data, zones_size, - __pa(PAGE_OFFSET) >> PAGE_SHIFT, zholes_size); + virt_to_phys((void *)PAGE_OFFSET) >> PAGE_SHIFT, + zholes_size); } #endif /* CONFIG_DISCONTIGMEM */ diff -puN arch/ppc64/kernel/chrp_setup.c~I3-nonlinear-types arch/ppc64/kernel/chrp_setup.c --- memhotplug/arch/ppc64/kernel/chrp_setup.c~I3-nonlinear-types 2004-08-20 11:28:18.000000000 -0700 +++ memhotplug-dave/arch/ppc64/kernel/chrp_setup.c 2004-08-20 11:28:18.000000000 -0700 @@ -194,8 +194,8 @@ void __init fwnmi_init(void) if (ibm_nmi_register == RTAS_UNKNOWN_SERVICE) return; ret = rtas_call(ibm_nmi_register, 2, 1, NULL, - __pa((unsigned long)SystemReset_FWNMI), - __pa((unsigned long)MachineCheck_FWNMI)); + virt_to_phys(SystemReset_FWNMI), + virt_to_phys(MachineCheck_FWNMI)); if (ret == 0) fwnmi_active = 1; } diff -puN mm/page_alloc.c~I3-nonlinear-types mm/page_alloc.c --- memhotplug/mm/page_alloc.c~I3-nonlinear-types 2004-08-20 11:28:18.000000000 -0700 +++ memhotplug-dave/mm/page_alloc.c 2004-08-20 11:28:18.000000000 -0700 @@ -1724,7 +1724,7 @@ EXPORT_SYMBOL(contig_page_data); void __init free_area_init(unsigned long *zones_size) { free_area_init_node(0, &contig_page_data, zones_size, - __pa(PAGE_OFFSET) >> PAGE_SHIFT, NULL); + __pa((void *)PAGE_OFFSET) >> PAGE_SHIFT, NULL); } #endif _