summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorChen Yu <yu.c.chen@intel.com>2016-08-19 06:37:23 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-09-13 02:15:58 +0200
commit5b3f249c94ce1f46bacd9814385b0ee2d1ae52f3 (patch)
tree65aed97e5443abc51075b88532ba7ab95dc0e52e /kernel
parentLinux 4.8-rc6 (diff)
downloadlinux-5b3f249c94ce1f46bacd9814385b0ee2d1ae52f3.tar.xz
linux-5b3f249c94ce1f46bacd9814385b0ee2d1ae52f3.zip
PM / sleep: Increase default DPM watchdog timeout to 120
Recently we have a new report that, the harddisk can not resume on time due to firmware issues, and got a kernel panic because of DPM watchdog timeout. So adjust the default timeout from 60 to 120 to survive on this platform, and make DPM_WATCHDOG depending on EXPERT. Link: https://bugzilla.kernel.org/show_bug.cgi?id=117971 Suggested-by: Pavel Machek <pavel@ucw.cz> Suggested-by: Rafael J. Wysocki <rafael@kernel.org> Reported-by: Higuita <higuita@gmx.net> Signed-off-by: Chen Yu <yu.c.chen@intel.com> Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 68d3ebc12601..e8517b63eb37 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -186,7 +186,7 @@ config PM_SLEEP_DEBUG
config DPM_WATCHDOG
bool "Device suspend/resume watchdog"
- depends on PM_DEBUG && PSTORE
+ depends on PM_DEBUG && PSTORE && EXPERT
---help---
Sets up a watchdog timer to capture drivers that are
locked up attempting to suspend/resume a device.
@@ -197,7 +197,7 @@ config DPM_WATCHDOG
config DPM_WATCHDOG_TIMEOUT
int "Watchdog timeout in seconds"
range 1 120
- default 60
+ default 120
depends on DPM_WATCHDOG
config PM_TRACE