diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /Documentation/filesystems | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/proc.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 99902ae6804e..7db71d6fba82 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
| @@ -1124,11 +1124,15 @@ debugging information is displayed on console. | |||
| 1124 | NMI switch that most IA32 servers have fires unknown NMI up, for example. | 1124 | NMI switch that most IA32 servers have fires unknown NMI up, for example. |
| 1125 | If a system hangs up, try pressing the NMI switch. | 1125 | If a system hangs up, try pressing the NMI switch. |
| 1126 | 1126 | ||
| 1127 | [NOTE] | 1127 | nmi_watchdog |
| 1128 | This function and oprofile share a NMI callback. Therefore this function | 1128 | ------------ |
| 1129 | cannot be enabled when oprofile is activated. | 1129 | |
| 1130 | And NMI watchdog will be disabled when the value in this file is set to | 1130 | Enables/Disables the NMI watchdog on x86 systems. When the value is non-zero |
| 1131 | non-zero. | 1131 | the NMI watchdog is enabled and will continuously test all online cpus to |
| 1132 | determine whether or not they are still functioning properly. | ||
| 1133 | |||
| 1134 | Because the NMI watchdog shares registers with oprofile, by disabling the NMI | ||
| 1135 | watchdog, oprofile may have more registers to utilize. | ||
| 1132 | 1136 | ||
| 1133 | 1137 | ||
| 1134 | 2.4 /proc/sys/vm - The virtual memory subsystem | 1138 | 2.4 /proc/sys/vm - The virtual memory subsystem |