summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreentime Hu <greentime@andestech.com>2018-02-21 09:21:23 +0300
committerGreentime Hu <greentime@andestech.com>2018-02-22 05:44:30 +0300
commit94bc61ead46c3d9943bd35a4536e61d4ea9f1e66 (patch)
tree11f1424f508f10e271433560c08bacb0f0093f45
parentb934e8eb483354bbadf1eee0a54e9487f50d6c5b (diff)
downloadlinux-94bc61ead46c3d9943bd35a4536e61d4ea9f1e66.tar.xz
xtensa: add ioremap_nocache declaration before include asm-generic/io.h.
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. Signed-off-by: Greentime Hu <greentime@andestech.com>
-rw-r--r--arch/xtensa/include/asm/io.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
index c38e5a732d86..acc5bb2cf1c7 100644
--- a/arch/xtensa/include/asm/io.h
+++ b/arch/xtensa/include/asm/io.h
@@ -52,6 +52,7 @@ static inline void __iomem *ioremap_cache(unsigned long offset,
return xtensa_ioremap_cache(offset, size);
}
#define ioremap_cache ioremap_cache
+#define ioremap_nocache ioremap_nocache
#define ioremap_wc ioremap_nocache
#define ioremap_wt ioremap_nocache