summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-03-25 13:26:13 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-03-26 16:07:49 -0700
commite42d1fe804408c57506a5326252b4db29958a7fb (patch)
treeff7cc4cd0e1901f40914944e79b288a9db6abcf5 /arch
parent898585172fa729513d8636257b44bd1cfd279096 (diff)
downloadop-kernel-dev-e42d1fe804408c57506a5326252b4db29958a7fb.zip
op-kernel-dev-e42d1fe804408c57506a5326252b4db29958a7fb.tar.gz
x86/PCI: make pci=lastbus=255 work when acpi is on
Impact: scan more peer root buses even acpi is used Move pci_bios_fixup_peer_bridges out of pci_legacy_init and into pci_subsys_init. This allows pci_bios_fixup_peer_bridges to be called even pci_apci_init is driving PCI initialization. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/pci/legacy.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index f1065b1..4061bb0 100644
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -50,8 +50,6 @@ static int __init pci_legacy_init(void)
if (pci_root_bus)
pci_bus_add_devices(pci_root_bus);
- pcibios_fixup_peer_bridges();
-
return 0;
}
@@ -67,6 +65,7 @@ int __init pci_subsys_init(void)
pci_visws_init();
#endif
pci_legacy_init();
+ pcibios_fixup_peer_bridges();
pcibios_irq_init();
pcibios_init();
OpenPOWER on IntegriCloud