diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-17 09:32:32 +0200 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2019-08-31 04:57:53 +0200 |
| commit | f3b17320db25b4cdd50f0396b096644455357dac (patch) | |
| tree | d1f009259f50bb779c19575fbfff425c3205ca22 /arch/openrisc/include | |
| parent | or1k: dts: Add ethoc device to SMP devicetree (diff) | |
| download | linux-f3b17320db25b4cdd50f0396b096644455357dac.tar.xz 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/include')
| -rw-r--r-- | arch/openrisc/include/asm/io.h | 20 | ||||
| -rw-r--r-- | arch/openrisc/include/asm/pgtable.h | 2 |
2 files changed, 4 insertions, 18 deletions
diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h index 06a710757789..5b81a96ab85e 100644 --- a/arch/openrisc/include/asm/io.h +++ b/arch/openrisc/include/asm/io.h @@ -25,25 +25,11 @@ #define PIO_OFFSET 0 #define PIO_MASK 0 -#define ioremap_nocache ioremap_nocache +#define ioremap_nocache ioremap #include <asm-generic/io.h> #include <asm/pgtable.h> -extern void __iomem *__ioremap(phys_addr_t offset, unsigned long size, - pgprot_t prot); - -static inline void __iomem *ioremap(phys_addr_t offset, size_t size) -{ - return __ioremap(offset, size, PAGE_KERNEL); -} - -/* #define _PAGE_CI 0x002 */ -static inline void __iomem *ioremap_nocache(phys_addr_t offset, - unsigned long size) -{ - return __ioremap(offset, size, - __pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_CI)); -} - +void __iomem *ioremap(phys_addr_t offset, unsigned long size); extern void iounmap(void *addr); + #endif diff --git a/arch/openrisc/include/asm/pgtable.h b/arch/openrisc/include/asm/pgtable.h index 497fd908a4c4..2fe9ff5b5d6f 100644 --- a/arch/openrisc/include/asm/pgtable.h +++ b/arch/openrisc/include/asm/pgtable.h @@ -97,7 +97,7 @@ extern void paging_init(void); /* Define some higher level generic page attributes. * * If you change _PAGE_CI definition be sure to change it in - * io.h for ioremap_nocache() too. + * io.h for ioremap() too. */ /* |