]> err.no Git - linux-2.6/commit
[POWERPC] Merge PCI resource fixups
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 20 Dec 2007 03:54:51 +0000 (14:54 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 20 Dec 2007 05:18:09 +0000 (16:18 +1100)
commitbf5e2ba28f24f82a64524ef4772c9ebe12e2cd2a
treef35c139d124a9276b71260c13c8bddf0aa02b4d7
parentfe2d338cdcc628e0abdb4f70570a7fa864c617db
[POWERPC] Merge PCI resource fixups

The PCI code in 32 and 64 bits fixes up resources differently.

32 bits uses a header quirk plus handles bridges in pcibios_fixup_bus()
while 64 bits does things in various places depending on whether you
are using OF probing, using PCI hotplug, etc...

This merges those by basically using the 32 bits approach for both,
with various tweaks to make 64 bits work with the new approach.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/pci-common.c
arch/powerpc/kernel/pci_32.c
arch/powerpc/kernel/pci_64.c
arch/powerpc/platforms/pseries/pci_dlpar.c
drivers/pci/hotplug/rpadlpar_core.c
include/asm-powerpc/machdep.h
include/asm-powerpc/pci-bridge.h
include/asm-powerpc/pci.h