diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-12-14 20:51:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-21 15:45:41 +0200 |
| commit | ed2bf5cee6c6d5dc788ef19e8b984182c594d3ec (patch) | |
| tree | 06907e4f1ef5bbb0d19c1103b4bd8eaaba98d186 | |
| parent | f73ec12dc718ee90ec45fd23dad38c5020a5b1f5 (diff) | |
um: Fix build w/o CONFIG_PM_SLEEP
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>
| -rw-r--r-- | arch/um/kernel/um_arch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 00c6dce14bd2..55930ca498e9 100644 --- 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) { /* |