diff options
| author |   Christoph Hellwig <hch@lst.de> | 2019-08-17 09:32:32 +0200 |
|---|---|---|
| committer |   Stafford Horne <shorne@gmail.com> | 2019-08-31 11:57:53 +0900 |
| commit | f3b17320db25b4cdd50f0396b096644455357dac (patch) | |
| tree | d1f009259f50bb779c19575fbfff425c3205ca22 /arch/openrisc/mm/ioremap.c | |
| parent | or1k: dts: Add ethoc device to SMP devicetree (diff) | |
| download | wireguard-linux-f3b17320db25b4cdd50f0396b096644455357dac.tar.xz wireguard-linux-f3b17320db25b4cdd50f0396b096644455357dac.zip | |
openrisc: map as uncached in ioremap
Openrisc is the only architecture not mapping ioremap as uncached,
which has been the default since the Linux 2.6.x days. Switch it
over to implement uncached semantics by default.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Stafford Horne <shorne@gmail.com>
Diffstat (limited to 'arch/openrisc/mm/ioremap.c')
| -rw-r--r-- | arch/openrisc/mm/ioremap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/openrisc/mm/ioremap.c b/arch/openrisc/mm/ioremap.c index e0c551ca0891..8f8e97f7eac9 100644 --- a/arch/openrisc/mm/ioremap.c +++ b/arch/openrisc/mm/ioremap.c @@ -34,8 +34,7 @@ static unsigned int fixmaps_used __initdata; * have to convert them into an offset in a page-aligned mapping, but the * caller shouldn't need to know that small detail. */ -void __iomem *__ref -__ioremap(phys_addr_t addr, unsigned long size, pgprot_t prot) +void __iomem *__ref ioremap(phys_addr_t addr, unsigned long size) { phys_addr_t p; unsigned long v; @@ -66,7 +65,8 @@ __ioremap(phys_addr_t addr, unsigned long size, pgprot_t prot) fixmaps_used += (size >> PAGE_SHIFT); } - if (ioremap_page_range(v, v + size, p, prot)) { + if (ioremap_page_range(v, v + size, p, + __pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_CI))) { if (likely(mem_init_done)) vfree(area->addr); else @@ -76,7 +76,7 @@ __ioremap(phys_addr_t addr, unsigned long size, pgprot_t prot) return (void __iomem *)(offset + (char *)v); } -EXPORT_SYMBOL(__ioremap); +EXPORT_SYMBOL(ioremap); void iounmap(void *addr) { |