diff --git a/[refs] b/[refs]
index ed76eff499b7..ba203c51f0d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c6edb0cc43688a12571a35728a06e2748d55af3
+refs/heads/master: 4be6a290b87af9136b482d5c22574f070ffdbdb8
diff --git a/trunk/drivers/iommu/msm_iommu.c b/trunk/drivers/iommu/msm_iommu.c
index cee307e86606..6a8870a31668 100644
--- a/trunk/drivers/iommu/msm_iommu.c
+++ b/trunk/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: