1 files changed, 19 insertions, 3 deletions

diff --git a/arch/x86/pci/bus_numa.c b/arch/x86/pci/bus_numa.c
index 306579f7d0fd..d37e2fec97e5 100644
--- a/arch/x86/pci/bus_numa.c
+++ b/arch/x86/pci/bus_numa.c
@@ -14,7 +14,7 @@ static struct pci_root_info *x86_find_pci_root_info(int bus)
                 return NULL;
 
         list_for_each_entry(info, &pci_root_infos, list)
-                if (info->bus_min == bus)
+                if (info->busn.start == bus)
                         return info;
 
         return NULL;
@@ -24,6 +24,8 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources)
 {
         struct pci_root_info *info = x86_find_pci_root_info(bus);
         struct pci_root_res *root_res;
+        struct pci_host_bridge_window *window;
+        bool found = false;
 
         if (!info)
                 goto default_resources;
@@ -31,6 +33,16 @@ void x86_pci_root_bus_resources(int bus, struct list_head *resources)
         printk(KERN_DEBUG "PCI: root bus %02x: hardware-probed resources\n",
                bus);
 
+        /* already added by acpi ? */
+        list_for_each_entry(window, resources, list)
+                if (window->res->flags & IORESOURCE_BUS) {
+                        found = true;
+                        break;
+                }
+
+        if (!found)
+                pci_add_resource(resources, &info->busn);
+
         list_for_each_entry(root_res, &info->resources, list) {
                 struct resource *res;
                 struct resource *root;
@@ -66,9 +78,13 @@ struct pci_root_info __init *alloc_pci_root_info(int bus_min, int bus_max,
         if (!info)
                 return info;
 
+        sprintf(info->name, "PCI Bus #%02x", bus_min);
+
         INIT_LIST_HEAD(&info->resources);
-        info->bus_min = bus_min;
-        info->bus_max = bus_max;
+        info->busn.name  = info->name;
+        info->busn.start = bus_min;
+        info->busn.end   = bus_max;
+        info->busn.flags = IORESOURCE_BUS;
         info->node = node;
         info->link = link;