Merge tag 'dlm-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[deliverable/linux.git] / drivers / iommu / msm_iommu.c

diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index cee307e866060ca30aa2627eaaf3f0cb7789802e..6a8870a31668e925e3071b4882a417cb1c231d80 100644 (file)
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -226,6 +226,11 @@ static int msm_iommu_domain_init(struct iommu_domain *domain)
 
        memset(priv->pgtable, 0, SZ_16K);
        domain->priv = priv;
+
+       domain->geometry.aperture_start = 0;
+       domain->geometry.aperture_end   = (1ULL << 32) - 1;
+       domain->geometry.force_aperture = true;
+
        return 0;
 
 fail_nomem: