Signed-off-by: Dave Hansen --- memhotplug-dave/arch/ppc64/mm/init.c | 2 +- memhotplug-dave/mm/page_alloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/ppc64/mm/init.c~I0-nonlinear-types arch/ppc64/mm/init.c --- memhotplug/arch/ppc64/mm/init.c~I0-nonlinear-types 2004-11-12 16:52:01.000000000 -0800 +++ memhotplug-dave/arch/ppc64/mm/init.c 2004-11-12 16:52:01.000000000 -0800 @@ -667,7 +667,7 @@ void __init paging_init(void) zholes_size[ZONE_DMA] = (top_of_ram - total_ram) >> PAGE_SHIFT; free_area_init_node(0, &contig_page_data, zones_size, - __pa(PAGE_OFFSET) >> PAGE_SHIFT, zholes_size); + __pa((void *)PAGE_OFFSET) >> PAGE_SHIFT, zholes_size); } #endif /* CONFIG_DISCONTIGMEM */ diff -L arch/ppc64/kernel/chrp_setup.c -puN /dev/null /dev/null diff -puN mm/page_alloc.c~I0-nonlinear-types mm/page_alloc.c --- memhotplug/mm/page_alloc.c~I0-nonlinear-types 2004-11-12 16:52:01.000000000 -0800 +++ memhotplug-dave/mm/page_alloc.c 2004-11-12 16:52:01.000000000 -0800 @@ -1846,7 +1846,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 _