diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:28:07 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-28 01:28:07 +0100 |
| commit | 6e0ca95aa3c83c47d13f9f400bfaaa853d0b224b (patch) | |
| tree | dcdf4bf395ed43d287d3e0a2aff649f38d63b1cb /kernel/power/Kconfig | |
| parent | 400fc45273d53837390bf1a24f5930c1ad9de61e (diff) | |
| parent | 7bc9b1cffc95675a957e870d258e95d43dcbba0b (diff) | |
| download | linux-6e0ca95aa3c83c47d13f9f400bfaaa853d0b224b.tar.gz linux-6e0ca95aa3c83c47d13f9f400bfaaa853d0b224b.tar.bz2 linux-6e0ca95aa3c83c47d13f9f400bfaaa853d0b224b.zip | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Hibernate: Use bool for boolean fields of struct snapshot_data
PM / Sleep: Detect device suspend/resume lockup and log event
Diffstat (limited to 'kernel/power/Kconfig')
| -rw-r--r-- | kernel/power/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index d444c4e834f4..2fac9cc79b3d 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -178,6 +178,22 @@ config PM_SLEEP_DEBUG def_bool y depends on PM_DEBUG && PM_SLEEP +config DPM_WATCHDOG + bool "Device suspend/resume watchdog" + depends on PM_DEBUG && PSTORE + ---help--- + Sets up a watchdog timer to capture drivers that are + locked up attempting to suspend/resume a device. + A detected lockup causes system panic with message + captured in pstore device for inspection in subsequent + boot session. + +config DPM_WATCHDOG_TIMEOUT + int "Watchdog timeout in seconds" + range 1 120 + default 12 + depends on DPM_WATCHDOG + config PM_TRACE bool help |