diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-21 15:20:27 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-21 15:20:27 +0400 |
| commit | 55b1c558bb2c8407cc2a2c68dd654cf1117ce60b (patch) | |
| tree | 325f2de6ff5d3b21815c0926688363005a8ead2c /kernel/power/Kconfig | |
| parent | 1be8086741a48bc3766b0ee98c35665290039aaf (diff) | |
| parent | e608a1e336aec6026cf4c06391f4d06169eafdc4 (diff) | |
Merge branch 'rebase-linaro-android-3.4' into merge-linux-linaro-core-tracking
Diffstat (limited to 'kernel/power/Kconfig')
| -rw-r--r-- | kernel/power/Kconfig | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index deb5461e3216..63cad888e241 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -18,6 +18,24 @@ config SUSPEND_FREEZER Turning OFF this setting is NOT recommended! If in doubt, say Y. +config HAS_WAKELOCK + bool + default n + +config WAKELOCK + bool + default n + +config USER_WAKELOCK + bool "Userspace wake locks" + depends on PM_SLEEP + default n + ---help--- + User-space wake lock api. Write "lockname" or "lockname timeout" + to /sys/power/wake_lock lock and if needed create a wake lock. + Write "lockname" to /sys/power/wake_unlock to unlock a user wake + lock. + config HIBERNATE_CALLBACKS bool @@ -243,3 +261,10 @@ config PM_GENERIC_DOMAINS_RUNTIME config CPU_PM bool depends on SUSPEND || CPU_IDLE + +config SUSPEND_TIME + bool "Log time spent in suspend" + ---help--- + Prints the time spent in suspend in the kernel log, and + keeps statistics on the time spent in suspend in + /sys/kernel/debug/suspend_time |