Commit 1fb1abc8 authored Dec 14, 2020 by Johannes Berg Committed by Richard Weinberger Dec 14, 2020

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>

parent 11385539

arch/um/kernel/um_arch.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message