diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2020-12-14 20:51:02 +0100 |
|---|---|---|
| committer |   Richard Weinberger <richard@nod.at> | 2020-12-14 21:15:32 +0100 |
| commit | 1fb1abc83636f5329c26cd29f0f19f3faeb697a5 (patch) | |
| tree | d043a003bed1826d4fdbb86ed314a47c39d20c96 /arch/um/kernel/um_arch.c | |
| parent | um: time-travel: Correct time event IRQ delivery (diff) | |
| download | linux-dev-1fb1abc83636f5329c26cd29f0f19f3faeb697a5.tar.xz linux-dev-1fb1abc83636f5329c26cd29f0f19f3faeb697a5.zip | |
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>
Diffstat (limited to 'arch/um/kernel/um_arch.c')
| -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 9c7e6d7ea1b3..31d356b1ffd8 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -379,12 +379,12 @@ void text_poke_sync(void) { } -#ifdef CONFIG_PM_SLEEP void uml_pm_wake(void) { pm_system_wakeup(); } +#ifdef CONFIG_PM_SLEEP static int um_suspend_valid(suspend_state_t state) { return state == PM_SUSPEND_MEM; |