diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:51:19 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:51:19 -0800 |
| commit | d74e026ae5c4d4289c2ca0a9c404eed4f4bb235e (patch) | |
| tree | a718106dac2c21534cf1faa039dadfc8695b58fa /Documentation | |
| parent | 449a97d07a8d4ed4e8e3981ce6ae42c25e381b24 (diff) | |
| parent | 7c0ae5be821c1b6a700c5506de9b62e95f60df3c (diff) | |
| download | linux-d74e026ae5c4d4289c2ca0a9c404eed4f4bb235e.tar.bz2 | |
Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-testing
Kees writes:
Become maintainer, add hardening tests for use-after-free and atomic wrapping.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/watchdog/watchdog-parameters.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt index 9f9ec9f76039..4e4b6f10d841 100644 --- a/Documentation/watchdog/watchdog-parameters.txt +++ b/Documentation/watchdog/watchdog-parameters.txt @@ -400,3 +400,7 @@ wm8350_wdt: nowayout: Watchdog cannot be stopped once started (default=kernel config parameter) ------------------------------------------------- +sun4v_wdt: +timeout_ms: Watchdog timeout in milliseconds 1..180000, default=60000) +nowayout: Watchdog cannot be stopped once started +------------------------------------------------- |