include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / arch / x86 / pci / acpi.c

diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 5f11ff6..c7b1ebf 100644 (file)
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -3,6 +3,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/dmi.h>
+#include <linux/slab.h>
 #include <asm/numa.h>
 #include <asm/pci_x86.h>
 
@@ -122,8 +123,8 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
        struct acpi_resource_address64 addr;
        acpi_status status;
        unsigned long flags;
-       struct resource *root;
-       u64 start, end;
+       struct resource *root, *conflict;
+       u64 start, end, max_len;
 
        status = resource_to_addr(acpi_res, &addr);
        if (!ACPI_SUCCESS(status))
@@ -140,6 +141,17 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
        } else
                return AE_OK;
 
+       max_len = addr.maximum - addr.minimum + 1;
+       if (addr.address_length > max_len) {
+               dev_printk(KERN_DEBUG, &info->bridge->dev,
+                          "host bridge window length %#llx doesn't fit in "
+                          "%#llx-%#llx, trimming\n",
+                          (unsigned long long) addr.address_length,
+                          (unsigned long long) addr.minimum,
+                          (unsigned long long) addr.maximum);
+               addr.address_length = max_len;
+       }
+
        start = addr.minimum + addr.translation_offset;
        end = start + addr.address_length - 1;
 
@@ -157,9 +169,12 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
                return AE_OK;
        }
 
-       if (insert_resource(root, res)) {
+       conflict = insert_resource_conflict(root, res);
+       if (conflict) {
                dev_err(&info->bridge->dev,
-                       "can't allocate host bridge window %pR\n", res);
+                       "address space collision: host bridge window %pR "
+                       "conflicts with %s %pR\n",
+                       res, conflict->name, conflict);
        } else {
                pci_bus_add_resource(info->bus, res, 0);
                info->res_num++;
@@ -298,17 +313,14 @@ int __init pci_acpi_init(void)
 {
        struct pci_dev *dev = NULL;
 
-       if (pcibios_scanned)
-               return 0;
-
        if (acpi_noirq)
-               return 0;
+               return -ENODEV;
 
        printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
        acpi_irq_penalty_init();
-       pcibios_scanned++;
        pcibios_enable_irq = acpi_pci_irq_enable;
        pcibios_disable_irq = acpi_pci_irq_disable;
+       x86_init.pci.init_irq = x86_init_noop;
 
        if (pci_routeirq) {
                /*