path: root/arch/x86
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-19 10:02:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-19 10:02:37 -0700
commit0c3bef612881ee6216a36952ffaabfc35b83545c (patch)
tree46e69e46d557c319ff3f261f37f1c184eaa9b844 /arch/x86
parent01b883358ba4b616d9d161b43af4bb5ee8124fe8 (diff)
parent69566dd8be42dea7a22f625abc96e65bb4b45d1f (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: OF: Don't crash when bridge parent is NULL. PCI: export pcie_bus_configure_settings symbol PCI: code and comments cleanup PCI: make cardbus-bridge resources optional PCI: make SRIOV resources optional PCI : ability to relocate assigned pci-resources PCI: honor child buses add_size in hot plug configuration PCI: Set PCI-E Max Payload Size on fabric
Diffstat (limited to 'arch/x86')
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index ae3cb23cd89b..c95330267f08 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -360,6 +360,15 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root)
+ /* After the PCI-E bus has been walked and all devices discovered,
+ * configure any settings of the fabric that might be necessary.
+ */
+ if (bus) {
+ struct pci_bus *child;
+ list_for_each_entry(child, &bus->children, node)
+ pcie_bus_configure_settings(child, child->self->pcie_mpss);
+ }
if (!bus)

Privacy Policy