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

Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next

Browse Source
This commit is contained in:
Joerg Roedel
2016-05-09 19:39:17 +02:00
parent e88ccab12a 8d7f2d84ed a5c0e0b4ac 3d1a2442d2 a0d284d2b1 d546635731 e85e8f69ce
commit 6c0b43df74
1405 changed files with 15830 additions and 9165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/iommu/intel-iommu.c
View File

@@ -1143,7 +1143,7 @@ next:
} while (!first_pte_in_page(++pte) && pfn <= last_pfn);
}
/* free page table pages. last level pte should already be cleared */
/* clear last level (leaf) ptes and free page table pages. */
static void dma_pte_free_pagetable(struct dmar_domain *domain,
unsigned long start_pfn,
unsigned long last_pfn)
@@ -2458,7 +2458,7 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw)
}
/* register PCI DMA alias device */
if (req_id != dma_alias && dev_is_pci(dev)) {
if (dev_is_pci(dev) && req_id != dma_alias) {
tmp = dmar_insert_one_dev_info(iommu, PCI_BUS_NUM(dma_alias),
dma_alias & 0xff, NULL, domain);