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/platforms | |
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/platforms')
-rw-r--r-- | arch/powerpc/platforms/ps3/spu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c index 39a472e9e80f..375a9f92158d 100644 --- a/arch/powerpc/platforms/ps3/spu.c +++ b/arch/powerpc/platforms/ps3/spu.c | |||
@@ -197,7 +197,7 @@ static void spu_unmap(struct spu *spu) | |||
197 | * The current HV requires the spu shadow regs to be mapped with the | 197 | * The current HV requires the spu shadow regs to be mapped with the |
198 | * PTE page protection bits set as read-only (PP=3). This implementation | 198 | * PTE page protection bits set as read-only (PP=3). This implementation |
199 | * uses the low level __ioremap() to bypass the page protection settings | 199 | * uses the low level __ioremap() to bypass the page protection settings |
200 | * inforced by ioremap_flags() to get the needed PTE bits set for the | 200 | * inforced by ioremap_prot() to get the needed PTE bits set for the |
201 | * shadow regs. | 201 | * shadow regs. |
202 | */ | 202 | */ |
203 | 203 | ||
@@ -214,7 +214,7 @@ static int __init setup_areas(struct spu *spu) | |||
214 | goto fail_ioremap; | 214 | goto fail_ioremap; |
215 | } | 215 | } |
216 | 216 | ||
217 | spu->local_store = (__force void *)ioremap_flags(spu->local_store_phys, | 217 | spu->local_store = (__force void *)ioremap_prot(spu->local_store_phys, |
218 | LS_SIZE, _PAGE_NO_CACHE); | 218 | LS_SIZE, _PAGE_NO_CACHE); |
219 | 219 | ||
220 | if (!spu->local_store) { | 220 | if (!spu->local_store) { |