summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorJon Derrick <jonathan.derrick@intel.com>2017-06-22 09:15:42 -0600
committerBjorn Helgaas <bhelgaas@google.com>2017-07-02 18:47:15 -0500
commit0cb259c47a4df466d641c1f07ae3eccaa9ba3ccb (patch)
tree097db8d12169db5a88ae407739fbf40a3d6b5618 /drivers/pci
parent575a144e7b3006c1b583ccecc4ede8b180d00d0c (diff)
PCI: vmd: Move SRCU cleanup after bus, child device removal
Recent __call_srcu() changes have exposed that we need to cleanup SRCU structures after pci_stop_root_bus() calls into vmd_msi_free(). Fixes: 3906b91844d6 ("PCI: vmd: Use SRCU as a local RCU to prevent delaying global RCU") Signed-off-by: Jon Derrick <jonathan.derrick@intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Keith Busch <keith.busch@intel.com> Cc: <stable@vger.kernel.org> # 4.11
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/host/vmd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/vmd.c b/drivers/pci/host/vmd.c
index 53aa1d4b17e8..9d83f37b4cb7 100644
--- a/drivers/pci/host/vmd.c
+++ b/drivers/pci/host/vmd.c
@@ -736,10 +736,10 @@ static void vmd_remove(struct pci_dev *dev)
struct vmd_dev *vmd = pci_get_drvdata(dev);
vmd_detach_resources(vmd);
- vmd_cleanup_srcu(vmd);
sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
pci_stop_root_bus(vmd->bus);
pci_remove_root_bus(vmd->bus);
+ vmd_cleanup_srcu(vmd);
vmd_teardown_dma_ops(vmd);
irq_domain_remove(vmd->irq_domain);
}