2 files changed, 1 insertions, 28 deletions

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 86d73d5d503f..71e2065639a6 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -70,28 +70,6 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
         return 0;
 }
 
-static int map_gic_id(struct acpi_subtable_header *entry,
-                int device_declaration, u32 acpi_id, int *apic_id)
-{
-        struct acpi_madt_generic_interrupt *gic =
-                (struct acpi_madt_generic_interrupt *)entry;
-
-        if (!(gic->flags & ACPI_MADT_ENABLED))
-                return -ENODEV;
-
-        /*
-         * In the GIC interrupt model, logical processors are
-         * required to have a Processor Device object in the DSDT,
-         * so we should check device_declaration here
-         */
-        if (device_declaration && (gic->uid == acpi_id)) {
-                *apic_id = gic->gic_id;
-                return 0;
-        }
-
-        return -EINVAL;
-}
-
 static int map_madt_entry(int type, u32 acpi_id)
 {
         unsigned long madt_end, entry;
@@ -127,9 +105,6 @@ static int map_madt_entry(int type, u32 acpi_id)
                 } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
                         if (!map_lsapic_id(header, type, acpi_id, &apic_id))
                                 break;
-                } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) {
-                        if (!map_gic_id(header, type, acpi_id, &apic_id))
-                                break;
                 }
                 entry += header->length;
         }
@@ -160,8 +135,6 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
                 map_lapic_id(header, acpi_id, &apic_id);
         } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
                 map_lsapic_id(header, type, acpi_id, &apic_id);
-        } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) {
-                map_gic_id(header, type, acpi_id, &apic_id);
         }
 
 exit:
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index bacddd102ae9..01712cbfd92e 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -385,7 +385,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
          * device is active because it itself may be in use */
         if (!dev->active) {
                 if (request_irq(*irq, pnp_test_handler,
-                                IRQF_DISABLED | IRQF_PROBE_SHARED, "pnp", NULL))
+                                IRQF_PROBE_SHARED, "pnp", NULL))
                         return 0;
                 free_irq(*irq, NULL);
         }