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_32.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_32.c')
-rw-r--r-- | arch/powerpc/mm/pgtable_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index fca98f8fb600..51f87956f8f8 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
@@ -141,7 +141,7 @@ ioremap_wc(phys_addr_t addr, unsigned long size) | |||
141 | EXPORT_SYMBOL(ioremap_wc); | 141 | EXPORT_SYMBOL(ioremap_wc); |
142 | 142 | ||
143 | void __iomem * | 143 | void __iomem * |
144 | ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags) | 144 | ioremap_prot(phys_addr_t addr, unsigned long size, unsigned long flags) |
145 | { | 145 | { |
146 | /* writeable implies dirty for kernel addresses */ | 146 | /* writeable implies dirty for kernel addresses */ |
147 | if (flags & _PAGE_RW) | 147 | if (flags & _PAGE_RW) |
@@ -160,7 +160,7 @@ ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags) | |||
160 | 160 | ||
161 | return __ioremap_caller(addr, size, flags, __builtin_return_address(0)); | 161 | return __ioremap_caller(addr, size, flags, __builtin_return_address(0)); |
162 | } | 162 | } |
163 | EXPORT_SYMBOL(ioremap_flags); | 163 | EXPORT_SYMBOL(ioremap_prot); |
164 | 164 | ||
165 | void __iomem * | 165 | void __iomem * |
166 | __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) | 166 | __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags) |