summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-09-22 13:57:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-23 08:09:14 -0700
commitb4d19cc84e8e6838f4aa0b26b3afcdc8c7f71505 (patch)
tree6686ed8811e0c157da1d1fd642653c2e4415ee4b /Documentation
parentdb203d53d474aa068984e409d807628f5841da1b (diff)
downloadlinux-3.10-b4d19cc84e8e6838f4aa0b26b3afcdc8c7f71505.tar.gz
linux-3.10-b4d19cc84e8e6838f4aa0b26b3afcdc8c7f71505.tar.bz2
linux-3.10-b4d19cc84e8e6838f4aa0b26b3afcdc8c7f71505.zip
Documentation/sysctl/kernel.txt: fix softlockup_thresh description
- s/s/seconds/ - s/10 seconds/60 seconds/ - Mention the zero-disables-it feature. Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sysctl/kernel.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 276a7e63782..e1ff0d920a5 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -351,9 +351,10 @@ kernel. This value defaults to SHMMAX.
softlockup_thresh:
-This value can be used to lower the softlockup tolerance
-threshold. The default threshold is 10s. If a cpu is locked up
-for 10s, the kernel complains. Valid values are 1-60s.
+This value can be used to lower the softlockup tolerance threshold. The
+default threshold is 60 seconds. If a cpu is locked up for 60 seconds,
+the kernel complains. Valid values are 1-60 seconds. Setting this
+tunable to zero will disable the softlockup detection altogether.
==============================================================