diff options
Diffstat (limited to 'arch/powerpc/include/asm/io.h')
| -rw-r--r-- | arch/powerpc/include/asm/io.h | 16 | 
1 files changed, 5 insertions, 11 deletions
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 23e5d5d16c7e..a63ec938636d 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h @@ -705,16 +705,9 @@ static inline void iosync(void)   *   create hand-made mappings for use only by the PCI code and cannot   *   currently be hooked. Must be page aligned.   * - * * __ioremap is the low level implementation used by ioremap and - *   ioremap_prot and cannot be hooked (but can be used by a hook on one - *   of the previous ones) - *   * * __ioremap_caller is the same as above but takes an explicit caller   *   reference rather than using __builtin_return_address(0)   * - * * __iounmap, is the low level implementation used by iounmap and cannot - *   be hooked (but can be used by a hook on iounmap) - *   */  extern void __iomem *ioremap(phys_addr_t address, unsigned long size);  extern void __iomem *ioremap_prot(phys_addr_t address, unsigned long size, @@ -729,13 +722,14 @@ void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size);  extern void iounmap(volatile void __iomem *addr); -extern void __iomem *__ioremap(phys_addr_t, unsigned long size, -			       unsigned long flags); +int early_ioremap_range(unsigned long ea, phys_addr_t pa, +			unsigned long size, pgprot_t prot); +void __iomem *do_ioremap(phys_addr_t pa, phys_addr_t offset, unsigned long size, +			 pgprot_t prot, void *caller); +  extern void __iomem *__ioremap_caller(phys_addr_t, unsigned long size,  				      pgprot_t prot, void *caller); -extern void __iounmap(volatile void __iomem *addr); -  extern void __iomem * __ioremap_at(phys_addr_t pa, void *ea,  				   unsigned long size, pgprot_t prot);  extern void __iounmap_at(void *ea, unsigned long size);  |