diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-05 11:00:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-05 11:00:53 +0000 |
| commit | 3cc3cdd80b944ed697c7aaeef25b7a170177d7f1 (patch) | |
| tree | f2df35ca55bc2d50876fe586b4eec8c68c158da7 /kernel/power | |
| parent | 1168f85d54c9cfcc0b93412c363e4d21bf36de47 (diff) | |
| parent | 54d6df91aea686c8c46095256d8c27d3db26c4e8 (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android
Conflicts:
arch/arm64/Makefile
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/process.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c index 498dfb8bfba3..d1ccce3cfee8 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; } |