Merge branch 'core-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull watchdog core update from Thomas Gleixner:
 "A single commit adding a command line parameter which allows to set
  the watchdog threshold on the kernel command-line, so kernels with
  massive debug facilities enabled won't trigger the watchdog during
  early boot and before the threshold can be changed via sysctl"

* 'core-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  watchdog/core: Add watchdog_thresh command line parameter

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index aa4f4cfd04914e3def6b309787c808c4c5c838b7..2b8ee90bb64470d0d6d6ccadccf8b8fbbf86509d 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -5078,6 +5078,14 @@
                        or other driver-specific files in the
                        Documentation/watchdog/ directory.
 
+       watchdog_thresh=
+                       [KNL]
+                       Set the hard lockup detector stall duration
+                       threshold in seconds. The soft lockup detector
+                       threshold is set to twice the value. A value of 0
+                       disables both lockup detectors. Default is 10
+                       seconds.
+
        workqueue.watchdog_thresh=
                        If CONFIG_WQ_WATCHDOG is configured, workqueue can
                        warn stall conditions and dump internal state to

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 977918d5d3501b1447781c91aedbe8fadad05ada..8fbfda94a67be8e6fe587e5425d1773e351b7431 100644 (file)
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -199,6 +199,13 @@ static int __init nosoftlockup_setup(char *str)
 }
 __setup("nosoftlockup", nosoftlockup_setup);
 
+static int __init watchdog_thresh_setup(char *str)
+{
+       get_option(&str, &watchdog_thresh);
+       return 1;
+}
+__setup("watchdog_thresh=", watchdog_thresh_setup);
+
 #ifdef CONFIG_SMP
 int __read_mostly sysctl_softlockup_all_cpu_backtrace;