From: Joerg Roedel <jroedel@suse.de>
Date: Tue, 26 Jul 2016 14:02:37 +0000 (+0200)
Subject: Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f360d3241f5557f241d55b959e6e65070e77992e;p=linux.git

Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/rockchip', 'arm/smmu' and 'core' into next
---

f360d3241f5557f241d55b959e6e65070e77992e
diff --cc drivers/iommu/intel-iommu.c
index 323dac9900ba3,a644d0cec2d82,0a97a6da407c7,a644d0cec2d82,a644d0cec2d82,10700945994ee,10700945994ee,323dac9900ba3,cfe410eedaf0b..9d2938e12aa3a
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@@@@@@@@@ -4607,8 -4600,8 -4600,8 -4600,8 -4600,8 -4607,8 -4607,8 -4607,8 -4607,8 +4607,8 @@@@@@@@@@ static void free_all_cpu_cached_iovas(u
         		if (!iommu)
         			continue;
         
 ------  		for (did = 0; did < 0xffff; did++) {
 ------  			domain = get_iommu_domain(iommu, did);
 ++++++  		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;