From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 19 Jun 2023 10:14:25 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v4.14.319~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=81eecab2359606e0c87d65a24da6d3d0d82f4150;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	um-fix-build-w-o-config_pm_sleep.patch
---

diff --git a/queue-5.10/series b/queue-5.10/series
index 8ab64d6c076..1b8df045199 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -86,3 +86,4 @@ media-dvbdev-fix-error-logic-at-dvb_register_device.patch
 media-dvb-core-fix-use-after-free-due-to-race-at-dvb_register_device.patch
 drm-i915-dg1-wait-for-pcode-uncore-handshake-at-startup.patch
 drm-i915-gen11-only-load-dram-information-from-pcode.patch
+um-fix-build-w-o-config_pm_sleep.patch
diff --git a/queue-5.10/um-fix-build-w-o-config_pm_sleep.patch b/queue-5.10/um-fix-build-w-o-config_pm_sleep.patch
new file mode 100644
index 00000000000..1e742cc741c
--- /dev/null
+++ b/queue-5.10/um-fix-build-w-o-config_pm_sleep.patch
@@ -0,0 +1,40 @@
+From 1fb1abc83636f5329c26cd29f0f19f3faeb697a5 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Mon, 14 Dec 2020 20:51:02 +0100
+Subject: um: Fix build w/o CONFIG_PM_SLEEP
+
+From: Johannes Berg <johannes.berg@intel.com>
+
+commit 1fb1abc83636f5329c26cd29f0f19f3faeb697a5 upstream.
+
+uml_pm_wake() is unconditionally called from the SIGUSR1 wakeup
+handler since that's in the userspace portion of UML, and thus
+a bit tricky to ifdef out. Since pm_system_wakeup() can always
+be called (but may be an empty inline), also simply always have
+uml_pm_wake() to fix the build.
+
+Reported-by: Randy Dunlap <rdunlap@infradead.org>
+Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Richard Weinberger <richard@nod.at>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/um/kernel/um_arch.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/um/kernel/um_arch.c
++++ b/arch/um/kernel/um_arch.c
+@@ -387,12 +387,12 @@ void text_poke_sync(void)
+ {
+ }
+ 
+-#ifdef CONFIG_PM_SLEEP
+ void uml_pm_wake(void)
+ {
+ 	pm_system_wakeup();
+ }
+ 
++#ifdef CONFIG_PM_SLEEP
+ static int init_pm_wake_signal(void)
+ {
+ 	/*