diff options
author | Anton Blanchard <anton@samba.org> | 2011-05-08 17:43:47 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 00:30:43 -0400 |
commit | 40f1ce7fb7e8b5d4d0821c0f3dc866cb1d47d99c (patch) | |
tree | 5a0f977967bb6353753b034bfb32ab11c8226d30 /arch/powerpc/mm/pgtable_64.c | |
parent | be135f40899cb3334faa7d2e27025055da311ec4 (diff) |
powerpc: Remove ioremap_flags
We have a confusing number of ioremap functions. Make things just a
bit simpler by merging ioremap_flags and ioremap_prot.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm/pgtable_64.c')
-rw-r--r-- | arch/powerpc/mm/pgtable_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c index 1146fc6e8921..6e595f6496d4 100644 --- a/arch/powerpc/mm/pgtable_64.c +++ b/arch/powerpc/mm/pgtable_64.c | |||
@@ -265,7 +265,7 @@ void __iomem * ioremap_wc(phys_addr_t addr, unsigned long size) | |||
265 | return __ioremap_caller(addr, size, flags, caller); | 265 | return __ioremap_caller(addr, size, flags, caller); |
266 | } | 266 | } |
267 | 267 | ||
268 | void __iomem * ioremap_flags(phys_addr_t addr, unsigned long size, | 268 | void __iomem * ioremap_prot(phys_addr_t addr, unsigned long size, |
269 | unsigned long flags) | 269 | unsigned long flags) |
270 | { | 270 | { |
271 | void *caller = __builtin_return_address(0); | 271 | void *caller = __builtin_return_address(0); |
@@ -322,7 +322,7 @@ void iounmap(volatile void __iomem *token) | |||
322 | 322 | ||
323 | EXPORT_SYMBOL(ioremap); | 323 | EXPORT_SYMBOL(ioremap); |
324 | EXPORT_SYMBOL(ioremap_wc); | 324 | EXPORT_SYMBOL(ioremap_wc); |
325 | EXPORT_SYMBOL(ioremap_flags); | 325 | EXPORT_SYMBOL(ioremap_prot); |
326 | EXPORT_SYMBOL(__ioremap); | 326 | EXPORT_SYMBOL(__ioremap); |
327 | EXPORT_SYMBOL(__ioremap_at); | 327 | EXPORT_SYMBOL(__ioremap_at); |
328 | EXPORT_SYMBOL(iounmap); | 328 | EXPORT_SYMBOL(iounmap); |