xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next

Browse Source
This commit is contained in:
Joerg Roedel
2017-06-28 14:45:02 +02:00
parent 84a21dbdef 4f1fcfe94c 26b6aec6e7 0b25635bd4 757c370f03 01e1932a17 9ce3a72cd7 0929deca40 72dcac6334
commit 6a7086431f
495 changed files with 5576 additions and 3400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iommu/dma-iommu.c
View File

@@ -314,7 +314,7 @@ int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base,
* If we have devices with different DMA masks, move the free
* area cache limit down for the benefit of the smaller one.
*/
iovad->dma_32bit_pfn = min(end_pfn, iovad->dma_32bit_pfn);
iovad->dma_32bit_pfn = min(end_pfn + 1, iovad->dma_32bit_pfn);
return 0;
}