summaryrefslogtreecommitdiff
path: root/Documentation/filesystems/proc.txt
diff options
context:
space:
mode:
authorAristeu Rozanski <aris@redhat.com>2008-10-30 20:08:50 +0300
committerIngo Molnar <mingo@elte.hu>2008-10-30 21:07:04 +0300
commit8a1c8eb75be492e20003966652c9cd5ff57a559d (patch)
tree9cd97cc9f80fa538017a2ed741de7393876aba08 /Documentation/filesystems/proc.txt
parentb062f841b569791d3054e975cd85f48562161565 (diff)
downloadlinux-8a1c8eb75be492e20003966652c9cd5ff57a559d.tar.xz
x86, nmi-watchdog: update procfs nmi_watchdog file documentation v2
Impact: improve documentation This patch updates the /proc/sys/kernel/nmi_watchdog documentation. Updated: included Randy Dunlap's corrections. Signed-off-by: Aristeu Rozanski <aris@redhat.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
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
Enables/Disables the NMI watchdog on x86 systems. When the value is non-zero
the NMI watchdog is enabled and will continuously test all online cpus to
-determine whether or not they are still functioning properly.
+determine whether or not they are still functioning properly. Currently,
+passing "nmi_watchdog=" parameter at boot time is required for this function
+to work.
-Because the NMI watchdog shares registers with oprofile, by disabling the NMI
-watchdog, oprofile may have more registers to utilize.
+If LAPIC NMI watchdog method is in use (nmi_watchdog=2 kernel parameter), the
+NMI watchdog shares registers with oprofile. By disabling the NMI watchdog,
+oprofile may have more registers to utilize.
msgmni
------