diff options
| author | Will Deacon <will@kernel.org> | 2020-01-10 13:20:03 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-01-10 15:52:25 +0000 |
| commit | fba6e960772b7b68189168abc3259384b7a44388 (patch) | |
| tree | 5d19a2c9659f606f6aac94d11a0bce27f3c5650f /drivers/iommu/arm-smmu-impl.c | |
| parent | fb485eb18e632ff1071662122b9d9b7d40c23c73 (diff) | |
| download | lwn-fba6e960772b7b68189168abc3259384b7a44388.tar.gz lwn-fba6e960772b7b68189168abc3259384b7a44388.zip | |
iommu/arm-smmu: Rename public #defines under ARM_SMMU_ namespace
Now that we have arm-smmu.h defining various SMMU constants, ensure that
they are namespaced with the ARM_SMMU_ prefix in order to avoid conflicts
with the CPU, such as the one we're currently bodging around with the
TCR.
Cc: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'drivers/iommu/arm-smmu-impl.c')
| -rw-r--r-- | drivers/iommu/arm-smmu-impl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu-impl.c b/drivers/iommu/arm-smmu-impl.c index b2fe72a8f019..74d97a886e93 100644 --- a/drivers/iommu/arm-smmu-impl.c +++ b/drivers/iommu/arm-smmu-impl.c @@ -119,7 +119,7 @@ int arm_mmu500_reset(struct arm_smmu_device *smmu) * Secure has also cleared SACR.CACHE_LOCK for this to take effect... */ reg = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_ID7); - major = FIELD_GET(ID7_MAJOR, reg); + major = FIELD_GET(ARM_SMMU_ID7_MAJOR, reg); reg = arm_smmu_gr0_read(smmu, ARM_SMMU_GR0_sACR); if (major >= 2) reg &= ~ARM_MMU500_ACR_CACHE_LOCK; |