فهرست منبع

uml: fix 5.10 build

the 5.10 uml build currently breaks with:

/usr/bin/ld: arch/um/os-Linux/signal.o: in function `sigusr1_handler':
arch/um/os-Linux/signal.c:141: undefined reference to `uml_pm_wake'

But there's an upstream fix for this. Backport the fix
for now but also let upstream know so it finds its way
through the -stable releases.

Signed-off-by: Christian Lamparter <[email protected]>
Christian Lamparter 3 سال پیش
والد
کامیت
8bea5edf89
1فایلهای تغییر یافته به همراه32 افزوده شده و 0 حذف شده
  1. 32 0
      target/linux/uml/patches-5.10/001-um-Fix-build-w-o-CONFIG_PM_SLEEP.patch

+ 32 - 0
target/linux/uml/patches-5.10/001-um-Fix-build-w-o-CONFIG_PM_SLEEP.patch

@@ -0,0 +1,32 @@
+From 1fb1abc83636f5329c26cd29f0f19f3faeb697a5 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <[email protected]>
+Date: Mon, 14 Dec 2020 20:51:02 +0100
+Subject: [PATCH] um: Fix build w/o CONFIG_PM_SLEEP
+
+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 <[email protected]>
+Acked-by: Randy Dunlap <[email protected]> # build-tested
+Signed-off-by: Johannes Berg <[email protected]>
+Signed-off-by: Richard Weinberger <[email protected]>
+---
+--- a/arch/um/kernel/um_arch.c
++++ b/arch/um/kernel/um_arch.c
+@@ -387,12 +387,12 @@
+ {
+ }
+ 
+-#ifdef CONFIG_PM_SLEEP
+ void uml_pm_wake(void)
+ {
+ 	pm_system_wakeup();
+ }
+ 
++#ifdef CONFIG_PM_SLEEP
+ static int init_pm_wake_signal(void)
+ {
+ 	/*