Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 077d3daf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents dbbdf54c 11295055

Documentation/admin-guide/kernel-parameters.txt

+8 −0
Original line number Diff line number Diff line
@@ -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

kernel/watchdog.c

+7 −0
Original line number Diff line number Diff line
@@ -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;