virt_to_phys should be in page.h instead of io.h. Moving it fixes a lot of compile errors, without need for circular dependencies. Signed-off-by: Joel Schopp Signed-off-by: Dave Hansen --- memhotplug-dave/include/asm-ppc64/io.h | 17 ----------------- memhotplug-dave/include/asm-ppc64/page.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 17 deletions(-) diff -puN include/asm-ppc64/io.h~G4-move-virt_to_phys-ppc64 include/asm-ppc64/io.h --- memhotplug/include/asm-ppc64/io.h~G4-move-virt_to_phys-ppc64 2004-11-12 16:51:53.000000000 -0800 +++ memhotplug-dave/include/asm-ppc64/io.h 2004-11-12 16:51:53.000000000 -0800 @@ -208,23 +208,6 @@ extern void iounmap(volatile void __iome extern void __iomem * reserve_phb_iospace(unsigned long size); /** - * virt_to_phys - map virtual addresses to physical - * @address: address to remap - * - * The returned physical address is the physical (CPU) mapping for - * the memory address given. It is only valid to use this function on - * addresses directly mapped or allocated via kmalloc. - * - * This function does not give bus mappings for DMA transfers. In - * almost all conceivable cases a device driver should not be using - * this function - */ -static inline unsigned long virt_to_phys(volatile void * address) -{ - return __pa((unsigned long)address); -} - -/** * phys_to_virt - map physical address to virtual * @address: address to remap * diff -puN include/asm-ppc64/page.h~G4-move-virt_to_phys-ppc64 include/asm-ppc64/page.h --- memhotplug/include/asm-ppc64/page.h~G4-move-virt_to_phys-ppc64 2004-11-12 16:51:53.000000000 -0800 +++ memhotplug-dave/include/asm-ppc64/page.h 2004-11-12 16:51:53.000000000 -0800 @@ -186,6 +186,24 @@ static inline int get_order(unsigned lon #define __va(x) __boot_va(x) #endif +/** + * virt_to_phys - map virtual addresses to physical + * @address: address to remap + * + * The returned physical address is the physical (CPU) mapping for + * the memory address given. It is only valid to use this function on + * addresses directly mapped or allocated via kmalloc. + * + * This function does not give bus mappings for DMA transfers. In + * almost all conceivable cases a device driver should not be using + * this function + */ +static inline unsigned long virt_to_phys(volatile void * address) +{ + return __pa((unsigned long)address); +} + + extern int page_is_ram(unsigned long pfn); #endif /* __ASSEMBLY__ */ _