Merge branch 'acpi-resources'

* acpi-resources: (23 commits)
  Merge branch 'pci/host-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into acpi-resources
  x86/irq, ACPI: Implement ACPI driver to support IOAPIC hotplug
  ACPI: Add interfaces to parse IOAPIC ID for IOAPIC hotplug
  x86/PCI: Refine the way to release PCI IRQ resources
  x86/PCI/ACPI: Use common ACPI resource interfaces to simplify implementation
  x86/PCI: Fix the range check for IO resources
  PCI: Use common resource list management code instead of private implementation
  resources: Move struct resource_list_entry from ACPI into resource core
  ACPI: Introduce helper function acpi_dev_filter_resource_type()
  ACPI: Add field offset to struct resource_list_entry
  ACPI: Translate resource into master side address for bridge window resources
  ACPI: Return translation offset when parsing ACPI address space resources
  ACPI: Enforce stricter checks for address space descriptors
  ACPI: Set flag IORESOURCE_UNSET for unassigned resources
  ACPI: Normalize return value of resource parser functions
  ACPI: Fix a bug in parsing ACPI Memory24 resource
  ACPI: Add prefetch decoding to the address space parser
  ACPI: Move the window flag logic to the combined parser
  ACPI: Unify the parsing of address_space and ext_address_space
  ACPI: Let the parser return false for disabled resources
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 23212f8ae09b..8d2f400e96cb 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1895,7 +1895,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
         int error;
         struct pci_host_bridge *bridge;
         struct pci_bus *b, *b2;
-        struct pci_host_bridge_window *window, *n;
+        struct resource_entry *window, *n;
         struct resource *res;
         resource_size_t offset;
         char bus_addr[64];
@@ -1959,8 +1959,8 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
                 printk(KERN_INFO "PCI host bridge to bus %s\n", dev_name(&b->dev));
 
         /* Add initial resources to the bus */
-        list_for_each_entry_safe(window, n, resources, list) {
-                list_move_tail(&window->list, &bridge->windows);
+        resource_list_for_each_entry_safe(window, n, resources) {
+                list_move_tail(&window->node, &bridge->windows);
                 res = window->res;
                 offset = window->offset;
                 if (res->flags & IORESOURCE_BUS)
@@ -2060,12 +2060,12 @@ void pci_bus_release_busn_res(struct pci_bus *b)
 struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
                 struct pci_ops *ops, void *sysdata, struct list_head *resources)
 {
-        struct pci_host_bridge_window *window;
+        struct resource_entry *window;
         bool found = false;
         struct pci_bus *b;
         int max;
 
-        list_for_each_entry(window, resources, list)
+        resource_list_for_each_entry(window, resources)
                 if (window->res->flags & IORESOURCE_BUS) {
                         found = true;
                         break;