evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iommu/vt-d: Make identity_mapping() take struct device not struct pci_dev

Browse source 
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
David Woodhouse 2014-03-09 14:03:28 -07:00
parent 41e80dca52
commit 9b226624bb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/iommu/intel-iommu.c
View file

@ -2439,14 +2439,14 @@ static int __init si_domain_init(int hw)
return 0; return 0;
} }
static int identity_mapping(struct pci_dev *pdev) static int identity_mapping(struct device *dev)
{ {
struct device_domain_info *info; struct device_domain_info *info;
if (likely(!iommu_identity_mapping)) if (likely(!iommu_identity_mapping))
return 0; return 0;
info = pdev->dev.archdata.iommu; info = dev->archdata.iommu;
if (info && info != DUMMY_DEVICE_DOMAIN_INFO) if (info && info != DUMMY_DEVICE_DOMAIN_INFO)
return (info->domain == si_domain); return (info->domain == si_domain);
@ -2903,7 +2903,7 @@ static int iommu_no_mapping(struct device *dev)
return 0; return 0;
pdev = to_pci_dev(dev); pdev = to_pci_dev(dev);
found = identity_mapping(pdev); found = identity_mapping(dev);
if (found) { if (found) {
if (iommu_should_identity_map(pdev, 0)) if (iommu_should_identity_map(pdev, 0))
return 1; return 1;