From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 15 Oct 2020 17:31:17 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v5.9.1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46435c234ac2c788d91bef3462060b14ad471a7b;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	acpi-always-build-evged-in.patch
---

diff --git a/queue-5.4/acpi-always-build-evged-in.patch b/queue-5.4/acpi-always-build-evged-in.patch
new file mode 100644
index 00000000000..d0d268f56a5
--- /dev/null
+++ b/queue-5.4/acpi-always-build-evged-in.patch
@@ -0,0 +1,39 @@
+From ac36d37e943635fc072e9d4f47e40a48fbcdb3f0 Mon Sep 17 00:00:00 2001
+From: Arjan van de Ven <arjan@linux.intel.com>
+Date: Wed, 9 Oct 2019 15:04:33 +0200
+Subject: ACPI: Always build evged in
+
+From: Arjan van de Ven <arjan@linux.intel.com>
+
+commit ac36d37e943635fc072e9d4f47e40a48fbcdb3f0 upstream.
+
+Although the Generic Event Device is a Hardware-reduced
+platfom device in principle, it should not be restricted to
+ACPI_REDUCED_HARDWARE_ONLY.
+
+Kernels supporting both fixed and hardware-reduced ACPI platforms
+should be able to probe the GED when dynamically detecting that a
+platform is hardware-reduced. For that, the driver must be
+unconditionally built in.
+
+Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
+Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Cc: Vishnu Rangayyan <vishnu.rangayyan@apple.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/acpi/Makefile
++++ b/drivers/acpi/Makefile
+@@ -48,7 +48,7 @@ acpi-y				+= acpi_pnp.o
+ acpi-$(CONFIG_ARM_AMBA)	+= acpi_amba.o
+ acpi-y				+= power.o
+ acpi-y				+= event.o
+-acpi-$(CONFIG_ACPI_REDUCED_HARDWARE_ONLY) += evged.o
++acpi-y				+= evged.o
+ acpi-y				+= sysfs.o
+ acpi-y				+= property.o
+ acpi-$(CONFIG_X86)		+= acpi_cmos_rtc.o
diff --git a/queue-5.4/series b/queue-5.4/series
index 1c9f9d9278c..024a9f6a295 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -2,3 +2,4 @@ perf-cs-etm-move-definition-of-traceid_list-global-variable-from-header-file.pat
 btrfs-don-t-pass-system_chunk-into-can_overcommit.patch
 btrfs-take-overcommit-into-account-in-inc_block_grou.patch
 arm-8939-1-kbuild-use-correct-nm-executable.patch
+acpi-always-build-evged-in.patch