From: Lorenzo Colitti Date: Thu, 27 Nov 2014 06:12:10 +0000 (+0900) Subject: Make suspend abort reason logging depend on CONFIG_PM_SLEEP X-Git-Tag: firefly_0821_release~4090^2~147 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=4fd02636be28ce91ae9b9da37014e74285f4cd2e;p=firefly-linux-kernel-4.4.55.git Make suspend abort reason logging depend on CONFIG_PM_SLEEP This unbreaks the build on architectures such as um that do not support CONFIG_PM_SLEEP. Change-Id: Ia846ed0a7fca1d762ececad20748d23610e8544f Signed-off-by: Lorenzo Colitti --- diff --git a/kernel/power/process.c b/kernel/power/process.c index 86a40fa35095..87387b939f13 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -34,7 +34,9 @@ static int try_to_freeze_tasks(bool user_only) unsigned int elapsed_msecs; bool wakeup = false; int sleep_usecs = USEC_PER_MSEC; +#ifdef CONFIG_PM_SLEEP char suspend_abort[MAX_SUSPEND_ABORT_LEN]; +#endif do_gettimeofday(&start); @@ -64,9 +66,11 @@ static int try_to_freeze_tasks(bool user_only) break; if (pm_wakeup_pending()) { +#ifdef CONFIG_PM_SLEEP pm_get_active_wakeup_sources(suspend_abort, MAX_SUSPEND_ABORT_LEN); log_suspend_abort_reason(suspend_abort); +#endif wakeup = true; break; }