Merge branch 'work.dcache2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / Documentation / watchdog / watchdog-parameters.rst

diff --git a/Documentation/watchdog/watchdog-parameters.rst b/Documentation/watchdog/watchdog-parameters.rst
index b121caae77986d796b86e9d69d31c1c5dd429633..a3985cc5aedac4dfbeac8998a0da2b933819cb14 100644 (file)
--- a/Documentation/watchdog/watchdog-parameters.rst
+++ b/Documentation/watchdog/watchdog-parameters.rst
@@ -13,6 +13,17 @@ modules.
 
 -------------------------------------------------
 
+watchdog core:
+    open_timeout:
+       Maximum time, in seconds, for which the watchdog framework will take
+       care of pinging a running hardware watchdog until userspace opens the
+       corresponding /dev/watchdogN device. A value of 0 means an infinite
+       timeout. Setting this to a non-zero value can be useful to ensure that
+       either userspace comes up properly, or the board gets reset and allows
+       fallback logic in the bootloader to try something else.
+
+-------------------------------------------------
+
 acquirewdt:
     wdt_stop:
        Acquire WDT 'stop' io port (default 0x43)