Commit 608adca5 authored Jul 26, 2012 by Linus Torvalds

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 3527ed81

parents 8ded2bbc 7f240b7d

arch/tile/kernel/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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] =

arch/tile/kernel/pci_gx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

		}