2 files changed, 19 insertions, 1 deletions

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index e2a87fcfa6cf..ef3a2cd3a7a0 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -123,7 +123,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev,
         }
 
         flags = irq_flags(triggering, polarity, shareable);
-        irq = acpi_register_gsi(gsi, triggering, polarity);
+        irq = acpi_register_gsi(&dev->dev, gsi, triggering, polarity);
         if (irq >= 0)
                 pcibios_penalize_isa_irq(irq, 1);
         else
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index f604061d2bb0..ba9765427886 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -638,6 +638,24 @@ int pnp_possible_config(struct pnp_dev *dev, int type, resource_size_t start,
 }
 EXPORT_SYMBOL(pnp_possible_config);
 
+int pnp_range_reserved(resource_size_t start, resource_size_t end)
+{
+        struct pnp_dev *dev;
+        struct pnp_resource *pnp_res;
+        resource_size_t *dev_start, *dev_end;
+
+        pnp_for_each_dev(dev) {
+                list_for_each_entry(pnp_res, &dev->resources, list) {
+                        dev_start = &pnp_res->res.start;
+                        dev_end   = &pnp_res->res.end;
+                        if (ranged_conflict(&start, &end, dev_start, dev_end))
+                                return 1;
+                }
+        }
+        return 0;
+}
+EXPORT_SYMBOL(pnp_range_reserved);
+
 /* format is: pnp_reserve_irq=irq1[,irq2] .... */
 static int __init pnp_setup_reserve_irq(char *str)
 {