diff options
Diffstat (limited to 'arch/powerpc/mm/pgtable_32.c')
-rw-r--r-- | arch/powerpc/mm/pgtable_32.c | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 8fcacb0239da..1891dbeeb8e9 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
@@ -141,29 +141,19 @@ void pte_free(struct page *ptepage) | |||
141 | __free_page(ptepage); | 141 | __free_page(ptepage); |
142 | } | 142 | } |
143 | 143 | ||
144 | #ifndef CONFIG_PHYS_64BIT | ||
145 | void __iomem * | 144 | void __iomem * |
146 | ioremap(phys_addr_t addr, unsigned long size) | 145 | ioremap(phys_addr_t addr, unsigned long size) |
147 | { | 146 | { |
148 | return __ioremap(addr, size, _PAGE_NO_CACHE); | 147 | return __ioremap(addr, size, _PAGE_NO_CACHE); |
149 | } | 148 | } |
150 | #else /* CONFIG_PHYS_64BIT */ | 149 | EXPORT_SYMBOL(ioremap); |
151 | void __iomem * | ||
152 | ioremap64(unsigned long long addr, unsigned long size) | ||
153 | { | ||
154 | return __ioremap(addr, size, _PAGE_NO_CACHE); | ||
155 | } | ||
156 | EXPORT_SYMBOL(ioremap64); | ||
157 | 150 | ||
158 | void __iomem * | 151 | void __iomem * |
159 | ioremap(phys_addr_t addr, unsigned long size) | 152 | ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags) |
160 | { | 153 | { |
161 | phys_addr_t addr64 = fixup_bigphys_addr(addr, size); | 154 | return __ioremap(addr, size, flags); |
162 | |||
163 | return ioremap64(addr64, size); | ||
164 | } | 155 | } |
165 | #endif /* CONFIG_PHYS_64BIT */ | 156 | EXPORT_SYMBOL(ioremap_flags); |
166 | EXPORT_SYMBOL(ioremap); | ||
167 | 157 | ||
168 | void __iomem * | 158 | void __iomem * |
169 | __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) | 159 | __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) |
@@ -264,20 +254,7 @@ void iounmap(volatile void __iomem *addr) | |||
264 | } | 254 | } |
265 | EXPORT_SYMBOL(iounmap); | 255 | EXPORT_SYMBOL(iounmap); |
266 | 256 | ||
267 | void __iomem *ioport_map(unsigned long port, unsigned int len) | 257 | int map_page(unsigned long va, phys_addr_t pa, int flags) |
268 | { | ||
269 | return (void __iomem *) (port + _IO_BASE); | ||
270 | } | ||
271 | |||
272 | void ioport_unmap(void __iomem *addr) | ||
273 | { | ||
274 | /* Nothing to do */ | ||
275 | } | ||
276 | EXPORT_SYMBOL(ioport_map); | ||
277 | EXPORT_SYMBOL(ioport_unmap); | ||
278 | |||
279 | int | ||
280 | map_page(unsigned long va, phys_addr_t pa, int flags) | ||
281 | { | 258 | { |
282 | pmd_t *pd; | 259 | pmd_t *pd; |
283 | pte_t *pg; | 260 | pte_t *pg; |