From 38db8e6ce112f5aecb06f434c26a1c780d2ea4e6 Mon Sep 17 00:00:00 2001 From: Patrick Daly Date: Mon, 22 Feb 2016 11:53:19 -0800 Subject: iommu/arm-smmu: Add iommu_dev for dynamic attach case A new struct element was added during the kernel 4.4 upgrade. Ensure that it is set during dynamic attach. Change-Id: I0150aebe4a67728945890be2b547a6cbb9bd5306 Signed-off-by: Patrick Daly --- drivers/iommu/arm-smmu.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers') diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 6c962c603333..21732857bac0 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1871,6 +1871,7 @@ static int arm_smmu_attach_dynamic(struct iommu_domain *domain, .ias = smmu->va_size, .oas = smmu->ipa_size, .tlb = &arm_smmu_gather_ops, + .iommu_dev = smmu->dev, }; fmt = IS_ENABLED(CONFIG_64BIT) ? ARM_64_LPAE_S1 : ARM_32_LPAE_S1; -- cgit v1.2.3