kernel/watchdog.c: allow hardlockup to panic by default

[linux-2.6-block.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d18a9e12152a701bb2729afdb65288ad6da2fccf..e9261e938f6ab8657586f6c068be1766bd725667 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1597,11 +1597,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Format: [state][,regs][,debounce][,die]
 
        nmi_watchdog=   [KNL,BUGS=X86] Debugging features for SMP kernels
-                       Format: [panic,][num]
+                       Format: [panic,][nopanic,][num]
                        Valid num: 0
                        0 - turn nmi_watchdog off
                        When panic is specified, panic when an NMI watchdog
-                       timeout occurs.
+                       timeout occurs (or 'nopanic' to override the opposite
+                       default).
                        This is useful when you use a panic=... timeout and
                        need the box quickly up again.
 
@@ -1825,6 +1826,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                perfmon on Intel CPUs instead of the
                                CPU specific event set.
 
+       oops=panic      Always panic on oopses. Default is to just kill the process,
+                       but there is a small probability of deadlocking the machine.
+                       This will also cause panics on machine check exceptions.
+                       Useful together with panic=30 to trigger a reboot.
+
        OSS             [HW,OSS]
                        See Documentation/sound/oss/oss-parameters.txt