summaryrefslogtreecommitdiff
path: root/include/asm-generic/io.h
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2016-05-09 12:03:37 +0200
committerJoerg Roedel <jroedel@suse.de>2016-05-09 12:03:37 +0200
commit8801561ce029ef2bf6927c53b834d711830bc8be (patch)
treef0c730e94e96a3a1f4ae102f311f3f0fd1ec8011 /include/asm-generic/io.h
parent44549e8f5eea4e0a41b487b63e616cb089922b99 (diff)
parent3ca3712a42f9e632eb41da94ca4eab4f1fb06fcb (diff)
downloadlinux-8801561ce029ef2bf6927c53b834d711830bc8be.tar.gz
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
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