diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /Documentation/nmi_watchdog.txt | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'Documentation/nmi_watchdog.txt')
| -rw-r--r-- | Documentation/nmi_watchdog.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/nmi_watchdog.txt b/Documentation/nmi_watchdog.txt index 90aa4531cb67..bf9f80a98282 100644 --- a/Documentation/nmi_watchdog.txt +++ b/Documentation/nmi_watchdog.txt | |||
| @@ -69,6 +69,11 @@ to the overall system performance. | |||
| 69 | On x86 nmi_watchdog is disabled by default so you have to enable it with | 69 | On x86 nmi_watchdog is disabled by default so you have to enable it with |
| 70 | a boot time parameter. | 70 | a boot time parameter. |
| 71 | 71 | ||
| 72 | It's possible to disable the NMI watchdog in run-time by writing "0" to | ||
| 73 | /proc/sys/kernel/nmi_watchdog. Writing "1" to the same file will re-enable | ||
| 74 | the NMI watchdog. Notice that you still need to use "nmi_watchdog=" parameter | ||
| 75 | at boot time. | ||
| 76 | |||
| 72 | NOTE: In kernels prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally | 77 | NOTE: In kernels prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally |
| 73 | on x86 SMP boxes. | 78 | on x86 SMP boxes. |
| 74 | 79 | ||