Merge branch 'topic/yinghai-busn-alloc' into next

* topic/yinghai-busn-alloc: (33 commits) PCI: hotplug: remove pci_do_scan_bus() PCI: sgihp: use generic pci_hp_add_bridge() PCI: ibmhp: use generic pci_hp_add_bridge() PCI: cpqhp: use generic pci_hp_add_bridge() PCI: shpchp: use generic pci_hp_add_bridge() PCI: cpci_hotplug: use generic pci_hp_add_bridge() PCI: pciehp: use generic pci_hp_add_bridge() PCI: add generic pci_hp_add_bridge() PCI: sgihp: register busn_res PCI: ibmhp: register busn_res PCI: cpqhp: register busn_res PCI: shpchp: register busn_res PCI: cpci_hotplug: register busn_res PCI: insert busn_res for child bus PCI: register busn_res for iov bus tile/PCI: use pci_scan_root_bus instead pci_scan_bus parisc/PCI: register busn_res for root buses powerpc/PCI: register busn_res for root buses sparc/PCI: register busn_res for root buses ia64/PCI: register busn_res for root buses ...
2026-11-13 07:31:07 +00:00 · 2012-06-13 17:04:30 -06:00 · 2012-06-13 17:04:30 -06:00 · 4d17e8516a
commit 4d17e8516a
parent cfaf025112 06aef8cec7
44 changed files with 367 additions and 245 deletions
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
--- a/arch/sparc/kernel/pci_impl.h
+++ b/arch/sparc/kernel/pci_impl.h
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
--- a/arch/x86/pci/bus_numa.c
+++ b/arch/x86/pci/bus_numa.c
--- a/arch/x86/pci/bus_numa.h
+++ b/arch/x86/pci/bus_numa.h
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
--- a/drivers/pci/hotplug-pci.c
+++ b/drivers/pci/hotplug-pci.c
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
--- a/drivers/pci/hotplug/shpchp_sysfs.c
+++ b/drivers/pci/hotplug/shpchp_sysfs.c
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/kernel/resource.c
+++ b/kernel/resource.c