33 lines
982 B
Diff
33 lines
982 B
Diff
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: [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 <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>
|
|
---
|
|
--- 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)
|
|
{
|
|
/*
|