3 files changed, 33 insertions, 12 deletions

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index c91e6c18debc..276ef9c18802 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -297,7 +297,6 @@ msi_bus_store(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR_RW(msi_bus);
 
-static DEFINE_MUTEX(pci_remove_rescan_mutex);
 static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,
                                 size_t count)
 {
@@ -308,10 +307,10 @@ static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,
                 return -EINVAL;
 
         if (val) {
-                mutex_lock(&pci_remove_rescan_mutex);
+                pci_lock_rescan_remove();
                 while ((b = pci_find_next_bus(b)) != NULL)
                         pci_rescan_bus(b);
-                mutex_unlock(&pci_remove_rescan_mutex);
+                pci_unlock_rescan_remove();
         }
         return count;
 }
@@ -342,9 +341,9 @@ dev_rescan_store(struct device *dev, struct device_attribute *attr,
                 return -EINVAL;
 
         if (val) {
-                mutex_lock(&pci_remove_rescan_mutex);
+                pci_lock_rescan_remove();
                 pci_rescan_bus(pdev->bus);
-                mutex_unlock(&pci_remove_rescan_mutex);
+                pci_unlock_rescan_remove();
         }
         return count;
 }
@@ -354,11 +353,7 @@ static struct device_attribute dev_rescan_attr = __ATTR(rescan,
 
 static void remove_callback(struct device *dev)
 {
-        struct pci_dev *pdev = to_pci_dev(dev);
-
-        mutex_lock(&pci_remove_rescan_mutex);
-        pci_stop_and_remove_bus_device(pdev);
-        mutex_unlock(&pci_remove_rescan_mutex);
+        pci_stop_and_remove_bus_device_locked(to_pci_dev(dev));
 }
 
 static ssize_t
@@ -395,12 +390,12 @@ dev_bus_rescan_store(struct device *dev, struct device_attribute *attr,
                 return -EINVAL;
 
         if (val) {
-                mutex_lock(&pci_remove_rescan_mutex);
+                pci_lock_rescan_remove();
                 if (!pci_is_root_bus(bus) && list_empty(&bus->devices))
                         pci_rescan_bus_bridge_resize(bus->self);
                 else
                         pci_rescan_bus(bus);
-                mutex_unlock(&pci_remove_rescan_mutex);
+                pci_unlock_rescan_remove();
         }
         return count;
 }
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index c86c8638d3c4..04796c056d12 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2024,6 +2024,24 @@ EXPORT_SYMBOL(pci_scan_slot);
 EXPORT_SYMBOL(pci_scan_bridge);
 EXPORT_SYMBOL_GPL(pci_scan_child_bus);
 
+/*
+ * pci_rescan_bus(), pci_rescan_bus_bridge_resize() and PCI device removal
+ * routines should always be executed under this mutex.
+ */
+static DEFINE_MUTEX(pci_rescan_remove_lock);
+
+void pci_lock_rescan_remove(void)
+{
+        mutex_lock(&pci_rescan_remove_lock);
+}
+EXPORT_SYMBOL_GPL(pci_lock_rescan_remove);
+
+void pci_unlock_rescan_remove(void)
+{
+        mutex_unlock(&pci_rescan_remove_lock);
+}
+EXPORT_SYMBOL_GPL(pci_unlock_rescan_remove);
+
 static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b)
 {
         const struct pci_dev *a = to_pci_dev(d_a);
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index f452148e6d55..10fa13f9e309 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -95,6 +95,14 @@ void pci_stop_and_remove_bus_device(struct pci_dev *dev)
 }
 EXPORT_SYMBOL(pci_stop_and_remove_bus_device);
 
+void pci_stop_and_remove_bus_device_locked(struct pci_dev *dev)
+{
+        pci_lock_rescan_remove();
+        pci_stop_and_remove_bus_device(dev);
+        pci_unlock_rescan_remove();
+}
+EXPORT_SYMBOL_GPL(pci_stop_and_remove_bus_device_locked);
+
 void pci_stop_root_bus(struct pci_bus *bus)
 {
         struct pci_dev *child, *tmp;