mmc: s3c6410: enable ADMA feature in 6410 sdhci controller

[safe/jmp/linux-2.6] / Documentation / nmi_watchdog.txt

diff --git a/Documentation/nmi_watchdog.txt b/Documentation/nmi_watchdog.txt
index 101bfcf..bf9f80a 100644 (file)
--- a/Documentation/nmi_watchdog.txt
+++ b/Documentation/nmi_watchdog.txt
@@ -69,7 +69,12 @@ to the overall system performance.
 On x86 nmi_watchdog is disabled by default so you have to enable it with
 a boot time parameter.
 
-NOTE: Prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally
+It's possible to disable the NMI watchdog in run-time by writing "0" to
+/proc/sys/kernel/nmi_watchdog. Writing "1" to the same file will re-enable
+the NMI watchdog. Notice that you still need to use "nmi_watchdog=" parameter
+at boot time.
+
+NOTE: In kernels prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally
 on x86 SMP boxes.
 
 [ feel free to send bug reports, suggestions and patches to