aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-02-27 13:06:55 +0100
committerIngo Molnar <mingo@kernel.org>2014-02-27 13:06:55 +0100
commitd2ae2e525ec4e5d58153fb7ff0c6e5873769fa73 (patch)
tree3379c713515d4073a45ecd18eb5dbd0cecd57e86
parentf207dbe63c61158c234e2e8929a3725a7f6b2b9b (diff)
parent70e0ac5f3683f48a8174a6f231a0f3097217c189 (diff)
Merge branch 'core/urgent' into core/locking
It's not really a regression fix, so move it to the v3.15 queue. Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--Documentation/sysctl/kernel.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index e55124e7c40c..e1d28fbf7570 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -320,10 +320,11 @@ This file shows up if CONFIG_DETECT_HUNG_TASK is enabled.
==============================================================
-hung_task_warning:
+hung_task_warnings:
The maximum number of warnings to report. During a check interval
-When this value is reached, no more the warnings will be reported.
+if a hung task is detected, this value is decreased by 1.
+When this value reaches 0, no more warnings will be reported.
This file shows up if CONFIG_DETECT_HUNG_TASK is enabled.
-1: report an infinite number of warnings.

Privacy Policy