summaryrefslogtreecommitdiff
path: root/include/asm-generic/io.h
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2016-05-09 15:33:17 +0200
committerJoerg Roedel <jroedel@suse.de>2016-05-09 15:33:17 +0200
commit9a51f3fc77f52b0ebdca5797bbbdb8e043037807 (patch)
tree38aa2e340f7d67c033e7bdd501db5082d4fbcbaa /include/asm-generic/io.h
parent809eac54cdd62c67afea1e17080e681dfa33dc09 (diff)
parent8801561ce029ef2bf6927c53b834d711830bc8be (diff)
downloadlinux-9a51f3fc77f52b0ebdca5797bbbdb8e043037807.tar.gz
Merge branch 'arm/smmu' into core
Diffstat (limited to 'include/asm-generic/io.h')
-rw-r--r--include/asm-generic/io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index eed3bbe88c8a..002b81f6f2bc 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -191,7 +191,7 @@ static inline void writeq(u64 value, volatile void __iomem *addr)
#define readl_relaxed readl
#endif
-#ifndef readq_relaxed
+#if defined(readq) && !defined(readq_relaxed)
#define readq_relaxed readq
#endif
@@ -207,7 +207,7 @@ static inline void writeq(u64 value, volatile void __iomem *addr)
#define writel_relaxed writel
#endif
-#ifndef writeq_relaxed
+#if defined(writeq) && !defined(writeq_relaxed)
#define writeq_relaxed writeq
#endif