From a2430f985d0b7327730dc9c2b12a4d85f3ce3f45 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 25 Feb 2012 13:54:21 -0800 Subject: [PATCH] --- yaml --- r: 294785 b: refs/heads/master c: 6b22cf3f35fd332e4cc2c1b27056920b3643667a h: refs/heads/master i: 294783: 696bf246a575264ded7ac17ed10326b785236d47 v: v3 --- [refs] | 2 +- trunk/drivers/pci/remove.c | 4 +++- trunk/include/linux/pci.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3274c084d4b4..a83b451373f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6754b9e9c33502223db066de50dda8a876f70c2c +refs/heads/master: 6b22cf3f35fd332e4cc2c1b27056920b3643667a diff --git a/trunk/drivers/pci/remove.c b/trunk/drivers/pci/remove.c index bd2be1c4c668..fd77e2bde2e8 100644 --- a/trunk/drivers/pci/remove.c +++ b/trunk/drivers/pci/remove.c @@ -90,7 +90,7 @@ static void __pci_remove_behind_bridge(struct pci_dev *dev); * device lists, remove the /proc entry, and notify userspace * (/sbin/hotplug). */ -static void __pci_remove_bus_device(struct pci_dev *dev) +void __pci_remove_bus_device(struct pci_dev *dev) { if (dev->subordinate) { struct pci_bus *b = dev->subordinate; @@ -102,6 +102,8 @@ static void __pci_remove_bus_device(struct pci_dev *dev) pci_destroy_dev(dev); } +EXPORT_SYMBOL(__pci_remove_bus_device); + void pci_stop_and_remove_bus_device(struct pci_dev *dev) { pci_stop_bus_device(dev); diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 073ae9d97ad6..5584aac96e28 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -686,6 +686,7 @@ u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); extern struct pci_dev *pci_dev_get(struct pci_dev *dev); extern void pci_dev_put(struct pci_dev *dev); extern void pci_remove_bus(struct pci_bus *b); +extern void __pci_remove_bus_device(struct pci_dev *dev); extern void pci_stop_and_remove_bus_device(struct pci_dev *dev); extern void pci_stop_bus_device(struct pci_dev *dev); void pci_setup_cardbus(struct pci_bus *bus);