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

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

Merge branches 'acpi-hotplug-fixes', 'acpi-build-fixes' and 'acpi-apei-fixes' 

* acpi-hotplug-fixes:
  ACPI: Do not create a platform_device for IOAPIC/IOxAPIC
  ACPI: ioapic: Clear on-stack resource before using it

* acpi-build-fixes:
  ACPI: Fix incompatibility with mcount-based function graph tracing

* acpi-apei-fixes:
  ACPI / APEI: Add missing synchronize_rcu() on NOTIFY_SCI removal
parents 08f63d97 61b79e16 7d64f82c

drivers/acpi/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
# Makefile for the Linux ACPI interpreter

#



ccflags-y			:= -Os

ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT



#

drivers/acpi/apei/ghes.c

+1 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,7 @@ static int ghes_remove(struct platform_device *ghes_dev) 
		if (list_empty(&ghes_sci))

			unregister_acpi_hed_notifier(&ghes_notifier_sci);

		mutex_unlock(&ghes_list_mutex);

		synchronize_rcu();

		break;

	case ACPI_HEST_NOTIFY_NMI:

		ghes_nmi_remove(ghes);