From: Bjorn Helgaas Date: Fri, 28 Oct 2011 22:27:17 +0000 (-0600) Subject: parisc/PCI: lba: deal with LMMIO/PAT overlaps before creating PCI root bus X-Git-Tag: v3.3-rc1~101^2~23 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4d9ea9abf04a6ad9643df5497e6243fbf64196e;p=pandora-kernel.git parisc/PCI: lba: deal with LMMIO/PAT overlaps before creating PCI root bus This moves the truncate_pat_collision() call out of the pcibios_fixup_bus() path so that when a future patch builds a list of root bus resources for pci_create_bus(), it can use the truncated LMMIO range. truncate_pat_collision() used to be called in this path: pci_scan_bus_parented pci_create_bus pci_scan_child_bus pcibios_fixup_bus lba_fixup_bus truncate_pat_collision All of the PAT and lba_dev resource setup must be done before we call pci_scan_bus_parented(), so it should be safe to move the truncate_pat_collision() to just before pci_scan_bus_parented(). CC: linux-parisc@vger.kernel.org Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes --- Reading git-diff-tree failed