summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2013-07-22 23:37:18 +0200
committerBjorn Helgaas <bhelgaas@google.com>2013-07-25 20:35:03 +0200
commit39772038ea93e85ea4f1307ec9c1f48a063d89a0 (patch)
tree310d32883c16365b532448a434a7b834f0d6404b /drivers/acpi
parentPCI: Move resource reallocation code to non-__init (diff)
downloadlinux-39772038ea93e85ea4f1307ec9c1f48a063d89a0.tar.xz
linux-39772038ea93e85ea4f1307ec9c1f48a063d89a0.zip
PCI: Assign resources for hot-added host bridge more aggressively
When hot-adding an ACPI host bridge, use pci_assign_unassigned_root_bus_resources() instead of pci_assign_unassigned_bus_resources(). The former is more aggressive and will release and reassign existing resources if necessary. This is safe at hot-add time because no drivers are bound to devices below the new host bridge yet. [bhelgaas: changelog, split __init changes out for reviewability] Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/pci_root.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index faa1d29c0261..ce04eb28e029 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -526,7 +526,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
if (system_state != SYSTEM_BOOTING) {
pcibios_resource_survey_bus(root->bus);
- pci_assign_unassigned_bus_resources(root->bus);
+ pci_assign_unassigned_root_bus_resources(root->bus);
}
pci_bus_add_devices(root->bus);