diff options
| author |   Christophe Leroy <christophe.leroy@c-s.fr> | 2018-10-09 13:51:43 +0000 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2018-10-14 18:04:09 +1100 |
| commit | 56f3c1413f5cce0c8f4d6f1ab79d790da5aa61af (patch) | |
| tree | a1ec8ea4a338d63d56353383ae49caad7b5b23dc /drivers/pcmcia/electra_cf.c | |
| parent | powerpc: don't use ioremap_prot() nor __ioremap() unless really needed. (diff) | |
| download | linux-dev-56f3c1413f5cce0c8f4d6f1ab79d790da5aa61af.tar.xz linux-dev-56f3c1413f5cce0c8f4d6f1ab79d790da5aa61af.zip | |
powerpc/mm: properly set PAGE_KERNEL flags in ioremap()
Set PAGE_KERNEL directly in the caller and do not rely on a
hack adding PAGE_KERNEL flags when _PAGE_PRESENT is not set.
As already done for PPC64, use pgprot_cache() helpers instead of
_PAGE_XXX flags in PPC32 ioremap() derived functions.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to '')
| -rw-r--r-- | drivers/pcmcia/electra_cf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c index 9671ded549f0..34d6c1a0971e 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c @@ -230,7 +230,7 @@ static int electra_cf_probe(struct platform_device *ofdev) if (!cf->mem_base || !cf->io_virt || !cf->gpio_base || (__ioremap_at(io.start, cf->io_virt, cf->io_size, - pgprot_val(pgprot_noncached(__pgprot(0)))) == NULL)) { + pgprot_val(pgprot_noncached(PAGE_KERNEL))) == NULL)) { dev_err(device, "can't ioremap ranges\n"); status = -ENOMEM; goto fail1; |