summaryrefslogtreecommitdiff
path: root/arch/m32r/include/asm/io.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-08-25 10:59:19 +0300
committerIngo Molnar <mingo@kernel.org>2015-08-25 10:59:19 +0300
commit8d58b66ed2b000f27658c88a4ed70e8042e86a58 (patch)
tree5bae2c74f932b5d863f72cb698a6f71260340b26 /arch/m32r/include/asm/io.h
parent13fe86f465b72fc9328d4f5ebc33223c011852ae (diff)
parentc13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff)
downloadlinux-8d58b66ed2b000f27658c88a4ed70e8042e86a58.tar.xz
Merge tag 'v4.2-rc8' into x86/mm, before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m32r/include/asm/io.h')
-rw-r--r--arch/m32r/include/asm/io.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/io.h b/arch/m32r/include/asm/io.h
index 4c4982af6fbd..61b8931bc192 100644
--- a/arch/m32r/include/asm/io.h
+++ b/arch/m32r/include/asm/io.h
@@ -175,6 +175,11 @@ static inline void _writel(unsigned long l, unsigned long addr)
#define iowrite16 writew
#define iowrite32 writel
+#define ioread16be(addr) be16_to_cpu(readw(addr))
+#define ioread32be(addr) be32_to_cpu(readl(addr))
+#define iowrite16be(v, addr) writew(cpu_to_be16(v), (addr))
+#define iowrite32be(v, addr) writel(cpu_to_be32(v), (addr))
+
#define mmiowb()
#define flush_write_buffers() do { } while (0) /* M32R_FIXME */