The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 01cf158e48d2b5ce947430de5896c10f4f7c1822
Gitweb: https://git.kernel.org/tip/01cf158e48d2b5ce947430de5896c10f4f7c1822
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Thu, 19 Nov 2020 15:07:19 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Thu, 19 Nov 2020 15:07:19 +01:00
Revert "iommu/vt-d: Take CONFIG_PCI_ATS into account"
This reverts commit 8986f223bd777a73119f5d593c15b4d630ff49bb.
The proper fix is queued in Will's tree now
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
drivers/iommu/intel/dmar.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/iommu/intel/dmar.c b/drivers/iommu/intel/dmar.c
index bc9f4cf..b2e8044 100644
--- a/drivers/iommu/intel/dmar.c
+++ b/drivers/iommu/intel/dmar.c
@@ -335,9 +335,7 @@ static void dmar_pci_bus_del_dev(struct dmar_pci_notify_info *info)
static inline void vf_inherit_msi_domain(struct pci_dev *pdev)
{
-#ifdef CONFIG_PCI_ATS
dev_set_msi_domain(&pdev->dev, dev_get_msi_domain(&pdev->physfn->dev));
-#endif
}
static int dmar_pci_bus_notifier(struct notifier_block *nb,
|