diff options
author | Joerg Roedel <jroedel@suse.de> | 2017-01-30 16:05:18 +0100 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2017-01-30 16:05:18 +0100 |
commit | ce273db0ff1ae64fea785af25a43977b0b6a4555 (patch) | |
tree | 1a5d03cb1e5c0d63f298691a980b3e248654619f /drivers/iommu/arm-smmu.c | |
parent | 93fa6cf60aad833e7572a61f98b2d0aa6f67de40 (diff) | |
parent | 14b4dbafa7e7e13323e402efd7723aafa391d69a (diff) |
Merge branch 'iommu/iommu-priv' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/core
Diffstat (limited to 'drivers/iommu/arm-smmu.c')
-rw-r--r-- | drivers/iommu/arm-smmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 13d26009b8e0..54368f557bed 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1217,7 +1217,7 @@ static int arm_smmu_domain_add_master(struct arm_smmu_domain *smmu_domain, continue; s2cr[idx].type = type; - s2cr[idx].privcfg = S2CR_PRIVCFG_UNPRIV; + s2cr[idx].privcfg = S2CR_PRIVCFG_DEFAULT; s2cr[idx].cbndx = cbndx; arm_smmu_write_s2cr(smmu, idx); } |