summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-26 13:48:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-26 13:48:08 -0700
commit608adca52305e4d14ca5978f9c62698ca45d3f42 (patch)
tree34bb35bd95dd579965dda1c0f925d540b112ab57
parent8ded2bbc1845e19c771eb55209aab166ef011243 (diff)
parent7f240b7db0956a426075eca73cc7ddf9fefa22a9 (diff)
downloadlinux-608adca52305e4d14ca5978f9c62698ca45d3f42.tar.bz2
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile PCI build fixes from Chris Metcalf: "This fixes a couple of issues with the pci_bus.subordinate removal from pci-next as it affected the tile architecture. One commit does the bombing for tilegx PCI (added during the merge window, so missed the pci-next bombing) and the other commit undoes a buggy part of the bombing for tilepro PCI." * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: tilepro pci: fix pci_bus.subordinate bad bombing from b918c62e tilegx pci: fix semantic merge conflict with 3527ed81c
-rw-r--r--arch/tile/kernel/pci.c2
-rw-r--r--arch/tile/kernel/pci_gx.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index 0fdd99d0d8b7..33c10864d2f7 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -369,7 +369,7 @@ int __init pcibios_init(void)
*/
if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI &&
(PCI_SLOT(dev->devfn) == 0)) {
- next_bus = dev->busn_res.end;
+ next_bus = dev->subordinate;
controllers[i].mem_resources[0] =
*next_bus->resource[0];
controllers[i].mem_resources[1] =
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index fa75264a82ae..0e213e35ffc3 100644
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -853,7 +853,7 @@ int __init pcibios_init(void)
bus = pci_scan_root_bus(NULL, next_busno, controller->ops,
controller, &resources);
controller->root_bus = bus;
- next_busno = bus->subordinate + 1;
+ next_busno = bus->busn_res.end + 1;
}