diff options
Diffstat (limited to 'arch/mips/include/asm/io.h')
-rw-r--r-- | arch/mips/include/asm/io.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index 933b50e125a0..9e777cd42b67 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h | |||
@@ -167,7 +167,7 @@ static inline void * isa_bus_to_virt(unsigned long address) | |||
167 | */ | 167 | */ |
168 | #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) | 168 | #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) |
169 | 169 | ||
170 | extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags); | 170 | extern void __iomem * __ioremap(phys_addr_t offset, phys_addr_t size, unsigned long flags); |
171 | extern void __iounmap(const volatile void __iomem *addr); | 171 | extern void __iounmap(const volatile void __iomem *addr); |
172 | 172 | ||
173 | #ifndef CONFIG_PCI | 173 | #ifndef CONFIG_PCI |
@@ -175,7 +175,7 @@ struct pci_dev; | |||
175 | static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {} | 175 | static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {} |
176 | #endif | 176 | #endif |
177 | 177 | ||
178 | static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size, | 178 | static inline void __iomem * __ioremap_mode(phys_addr_t offset, unsigned long size, |
179 | unsigned long flags) | 179 | unsigned long flags) |
180 | { | 180 | { |
181 | void __iomem *addr = plat_ioremap(offset, size, flags); | 181 | void __iomem *addr = plat_ioremap(offset, size, flags); |
@@ -183,7 +183,7 @@ static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size, | |||
183 | if (addr) | 183 | if (addr) |
184 | return addr; | 184 | return addr; |
185 | 185 | ||
186 | #define __IS_LOW512(addr) (!((phys_t)(addr) & (phys_t) ~0x1fffffffULL)) | 186 | #define __IS_LOW512(addr) (!((phys_addr_t)(addr) & (phys_addr_t) ~0x1fffffffULL)) |
187 | 187 | ||
188 | if (cpu_has_64bit_addresses) { | 188 | if (cpu_has_64bit_addresses) { |
189 | u64 base = UNCAC_BASE; | 189 | u64 base = UNCAC_BASE; |
@@ -197,7 +197,7 @@ static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size, | |||
197 | return (void __iomem *) (unsigned long) (base + offset); | 197 | return (void __iomem *) (unsigned long) (base + offset); |
198 | } else if (__builtin_constant_p(offset) && | 198 | } else if (__builtin_constant_p(offset) && |
199 | __builtin_constant_p(size) && __builtin_constant_p(flags)) { | 199 | __builtin_constant_p(size) && __builtin_constant_p(flags)) { |
200 | phys_t phys_addr, last_addr; | 200 | phys_addr_t phys_addr, last_addr; |
201 | 201 | ||
202 | phys_addr = fixup_bigphys_addr(offset, size); | 202 | phys_addr = fixup_bigphys_addr(offset, size); |
203 | 203 | ||