Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f01a5865 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-processor' and 'pnp' 

* acpi-processor:
  Revert "ACPI / processor: Make it possible to get APIC ID via GIC"

* pnp:
  PNP: remove deprecated IRQF_DISABLED
parents 08476907 3e9eac50 e1563769

drivers/acpi/processor_core.c

+0 −27
Original line number Diff line number Diff line
@@ -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:

drivers/pnp/resource.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}