diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2017-09-09 17:41:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-14 15:38:17 +0200 |
| commit | ff04be02de1b371689260ab2e217a93b57ea4364 (patch) | |
| tree | 36a4a677120961a6a52fe866aae5c28bc340e8ed /Documentation | |
| parent | b058014bd9ee72304191b2d8482f7ea63f34b534 (diff) | |
watchdog: Revert "iTCO_wdt: all versions count down twice"
commit fc61e83a29308601e6e8a0759e24fc8fe2122692 upstream.
This reverts commit 1fccb73011ea8a5fa0c6d357c33fa29c695139ea.
Reported as Bug 196509 - iTCO_wdt regression reboot before timeout expire
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/watchdog/watchdog-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt index b3526365ea8e..6f9d7b418917 100644 --- a/Documentation/watchdog/watchdog-parameters.txt +++ b/Documentation/watchdog/watchdog-parameters.txt @@ -117,7 +117,7 @@ nowayout: Watchdog cannot be stopped once started ------------------------------------------------- iTCO_wdt: heartbeat: Watchdog heartbeat in seconds. - (5<=heartbeat<=74 (TCO v1) or 1226 (TCO v2), default=30) + (2<heartbeat<39 (TCO v1) or 613 (TCO v2), default=30) nowayout: Watchdog cannot be stopped once started (default=kernel config parameter) ------------------------------------------------- |