shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

um: Fix build w/o CONFIG_PM_SLEEP

Browse Source 
commit 1fb1abc836 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>
This commit is contained in:
Johannes Berg
2020-12-14 20:51:02 +01:00
committed by Greg Kroah-Hartman
parent f73ec12dc7
commit ed2bf5cee6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/kernel/um_arch.c
View File

@@ -387,12 +387,12 @@ void text_poke_sync(void)
{ {
} }
#ifdef CONFIG_PM_SLEEP
void uml_pm_wake(void) void uml_pm_wake(void)
{ {
pm_system_wakeup(); pm_system_wakeup();
} }
#ifdef CONFIG_PM_SLEEP
static int init_pm_wake_signal(void) static int init_pm_wake_signal(void)
{ {
/* /*