Skip to content

Commit d720e64

Browse files
rmurphy-armwilldeacon
authored andcommitted
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 6d7dff6 ("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 <[email protected]> Signed-off-by: Will Deacon <[email protected]>
1 parent 4b67f1d commit d720e64

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

drivers/iommu/arm-smmu.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <linux/err.h>
2727
#include <linux/interrupt.h>
2828
#include <linux/io.h>
29-
#include <linux/io-64-nonatomic-hi-lo.h>
3029
#include <linux/iopoll.h>
3130
#include <linux/init.h>
3231
#include <linux/moduleparam.h>

drivers/iommu/arm-smmu.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/bits.h>
1515
#include <linux/clk.h>
1616
#include <linux/device.h>
17+
#include <linux/io-64-nonatomic-hi-lo.h>
1718
#include <linux/io-pgtable.h>
1819
#include <linux/iommu.h>
1920
#include <linux/mutex.h>

0 commit comments

Comments
 (0)