diff options
| author | Robin Murphy <robin.murphy@arm.com> | 2019-08-20 13:38:49 +0200 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-08-20 13:48:37 +0200 |
| commit | d720e64150c79d14f4faf931604faa1f0755134d (patch) | |
| tree | ea2a00747caf00cb9e517f30529c22d6a16d5f56 | |
| parent | iommu/arm-smmu: Make private implementation details static (diff) | |
| download | linux-d720e64150c79d14f4faf931604faa1f0755134d.tar.xz linux-d720e64150c79d14f4faf931604faa1f0755134d.zip | |
iommu/arm-smmu: Ensure 64-bit I/O accessors are available on 32-bit CPU
As part of the grand SMMU driver refactoring effort, the I/O register
accessors were moved into 'arm-smmu.h' in commit 6d7dff62afb0
("iommu/arm-smmu: Move Secure access quirk to implementation").
On 32-bit architectures (such as ARM), the 64-bit accessors are defined
in 'linux/io-64-nonatomic-hi-lo.h', so include this header to fix the
build.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 1 | ||||
| -rw-r--r-- | drivers/iommu/arm-smmu.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index b8628e2ab579..523a88842e7f 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -26,7 +26,6 @@ #include <linux/err.h> #include <linux/interrupt.h> #include <linux/io.h> -#include <linux/io-64-nonatomic-hi-lo.h> #include <linux/iopoll.h> #include <linux/init.h> #include <linux/moduleparam.h> diff --git a/drivers/iommu/arm-smmu.h b/drivers/iommu/arm-smmu.h index 611ed742e56f..ac9eac966cf5 100644 --- a/drivers/iommu/arm-smmu.h +++ b/drivers/iommu/arm-smmu.h @@ -14,6 +14,7 @@ #include <linux/bits.h> #include <linux/clk.h> #include <linux/device.h> +#include <linux/io-64-nonatomic-hi-lo.h> #include <linux/io-pgtable.h> #include <linux/iommu.h> #include <linux/mutex.h> |