summaryrefslogtreecommitdiffstats
path: root/arch/ia64/pci
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-05-17 18:51:12 -0700
committerBjorn Helgaas <bhelgaas@google.com>2012-06-13 15:42:24 -0600
commit2661b819a10d432aa6f508630ff72e31367d4f21 (patch)
tree04b3076d7995b37bd074f01401646705d7637144 /arch/ia64/pci
parenta10bb128b64fe03198c4930f4483dda55c5c84eb (diff)
downloadlinux-2661b819a10d432aa6f508630ff72e31367d4f21.tar.bz2
ia64/PCI: register busn_res for root buses
Add the host bridge bus number aperture from _CRS to the resource list. Like the MMIO and I/O port apertures, this is used when assigning resources to hot-added devices or in the case of conflicts. [bhelgaas: changelog] CC: Tony Luck <tony.luck@intel.com> CC: Fenghua Yu <fenghua.yu@intel.com> CC: linux-ia64@vger.kernel.org Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/ia64/pci')
-rw-r--r--arch/ia64/pci/pci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 3ca9bed7dc50..d173a88d744a 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -351,6 +351,8 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
#endif
INIT_LIST_HEAD(&info.resources);
+ /* insert busn resource at first */
+ pci_add_resource(&info.resources, &root->secondary);
acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,
&windows);
if (windows) {
@@ -384,7 +386,7 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
return NULL;
}
- pbus->busn_res.end = pci_scan_child_bus(pbus);
+ pci_scan_child_bus(pbus);
return pbus;
out3: