diff options
| author | Joerg Roedel | 2016-05-09 12:03:37 +0200 |
|---|---|---|
| committer | Joerg Roedel | 2016-05-09 12:03:37 +0200 |
| commit | 8801561ce029ef2bf6927c53b834d711830bc8be (patch) | |
| tree | f0c730e94e96a3a1f4ae102f311f3f0fd1ec8011 /include/asm-generic | |
| parent | Linux 4.6-rc7 (diff) | |
| parent | iommu/arm-smmu: Clear cache lock bit of ACR (diff) | |
| download | kernel-qcow2-linux-8801561ce029ef2bf6927c53b834d711830bc8be.tar.gz kernel-qcow2-linux-8801561ce029ef2bf6927c53b834d711830bc8be.tar.xz kernel-qcow2-linux-8801561ce029ef2bf6927c53b834d711830bc8be.zip | |
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')
| -rw-r--r-- | include/asm-generic/io.h | 4 |
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 |