aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems/proc.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/filesystems/proc.txt')
-rw-r--r--Documentation/filesystems/proc.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index bcceb99b81dd..86be879ed70e 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -1338,10 +1338,13 @@ nmi_watchdog
1338 1338
1339Enables/Disables the NMI watchdog on x86 systems. When the value is non-zero 1339Enables/Disables the NMI watchdog on x86 systems. When the value is non-zero
1340the NMI watchdog is enabled and will continuously test all online cpus to 1340the NMI watchdog is enabled and will continuously test all online cpus to
1341determine whether or not they are still functioning properly. 1341determine whether or not they are still functioning properly. Currently,
1342passing "nmi_watchdog=" parameter at boot time is required for this function
1343to work.
1342 1344
1343Because the NMI watchdog shares registers with oprofile, by disabling the NMI 1345If LAPIC NMI watchdog method is in use (nmi_watchdog=2 kernel parameter), the
1344watchdog, oprofile may have more registers to utilize. 1346NMI watchdog shares registers with oprofile. By disabling the NMI watchdog,
1347oprofile may have more registers to utilize.
1345 1348
1346msgmni 1349msgmni
1347------ 1350------