Merge branch 'pci/yinghai-survey-resources' into next

Browse source

* pci/yinghai-survey-resources:
  x86/PCI: Implement pcibios_resource_survey_bus()
  PCI/ACPI: Reserve firmware-allocated resources for hot-added root buses
  x86/PCI: Keep resource allocation functions after boot
  x86/PCI: Don't track firmware-assigned BAR values for hot-added devices
  x86/PCI: Factor out pcibios_allocate_dev_rom_resource()
  x86/PCI: Allocate resources on a per-bus basis for hot-adding root buses
  x86/PCI: Factor out pcibios_allocate_dev_resources()
  x86/PCI: Factor out pcibios_allocate_bridge_resources()

...

This commit is contained in:

Bjorn Helgaas 2013-01-09 11:37:16 -07:00

parent e84d0dedd3 b3e65e1f91

commit e84813c0cb

4 changed files with 127 additions and 65 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

187

arch/x86/pci/i386.c

View file

4

drivers/acpi/pci_root.c

View file

2

drivers/pci/bus.c

View file

1

include/linux/pci.h

View file