diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2016-08-03 12:55:49 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-08-03 12:55:49 +0200 |
| commit | 4a89cf810130fde41e3fc729e770cb1a5a87d245 (patch) | |
| tree | 84da40f8d26e51c21e61fc4fc5b7242c0050ae7d /drivers/iommu/intel-iommu.c | |
| parent | 4f53989b0652ffe2605221c81ca8ffcfc90aed2a (diff) | |
| parent | e9cbf6299e306d6f2ff7b8fe7ac66059191b182f (diff) | |
Merge branch '4.7-fixes' into mips-for-linux-next
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index cfe410eedaf0..323dac9900ba 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -4602,13 +4602,13 @@ static void free_all_cpu_cached_iovas(unsigned int cpu) for (i = 0; i < g_num_of_iommus; i++) { struct intel_iommu *iommu = g_iommus[i]; struct dmar_domain *domain; - u16 did; + int did; if (!iommu) continue; for (did = 0; did < cap_ndoms(iommu->cap); did++) { - domain = get_iommu_domain(iommu, did); + domain = get_iommu_domain(iommu, (u16)did); if (!domain) continue; |