aboutsummaryrefslogtreecommitdiff
path: root/arch/openrisc
diff options
context:
space:
mode:
authorGreentime Hu <greentime@andestech.com>2017-12-22 22:18:40 +0800
committerGreentime Hu <greentime@andestech.com>2018-02-22 10:44:30 +0800
commitb934e8eb483354bbadf1eee0a54e9487f50d6c5b (patch)
tree0aa564fe5add49eff22fc19feb898015534c142d /arch/openrisc
parent7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff)
download96b-common-b934e8eb483354bbadf1eee0a54e9487f50d6c5b.tar.gz
openrisc: add ioremap_nocache declaration before include asm-generic/io.h and sync ioremap prototype with it.
A future commit for the nds32 architecture bootstrap("asm-generic/io.h: move ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt out of ifndef CONFIG_MMU") will move the ioremap_nocache out of the CONFIG_MMU ifdef. This means that in order to suppress re-definition errors we need to setup #define's before importing asm-generic/io.h. Also, the change adds a prototype for ioremap where size is size_t so fix that as well. Signed-off-by: Greentime Hu <greentime@andestech.com> Acked-by: Stafford Horne <shorne@gmail.com>
Diffstat (limited to 'arch/openrisc')
-rw-r--r--arch/openrisc/include/asm/io.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h
index 7c691399da3f..6709b28a0221 100644
--- a/arch/openrisc/include/asm/io.h
+++ b/arch/openrisc/include/asm/io.h
@@ -29,13 +29,14 @@
#define PIO_OFFSET 0
#define PIO_MASK 0
+#define ioremap_nocache ioremap_nocache
#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, unsigned long size)
+static inline void __iomem *ioremap(phys_addr_t offset, size_t size)
{
return __ioremap(offset, size, PAGE_KERNEL);
}