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 738c6fda3fb015dce6ae90af393aeda543254380..e9261e938f6ab8657586f6c068be1766bd725667 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -626,6 +626,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        disable=        [IPV6]
                        See Documentation/networking/ipv6.txt.
 
+       disable_ddw     [PPC/PSERIES]
+                       Disable Dynamic DMA Window support. Use this if
+                       to workaround buggy firmware.
+
        disable_ipv6=   [IPV6]
                        See Documentation/networking/ipv6.txt.
 
@@ -1580,16 +1584,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        of returning the full 64-bit number.
                        The default is to return 64-bit inode numbers.
 
+       nfs.nfs4_disable_idmapping=
+                       [NFSv4] When set, this option disables the NFSv4
+                       idmapper on the client, but only if the mount
+                       is using the 'sec=sys' security flavour. This may
+                       make migration from legacy NFSv2/v3 systems easier
+                       provided that the server has the appropriate support.
+                       The default is to always enable NFSv4 idmapping.
+
        nmi_debug=      [KNL,AVR32,SH] Specify one or more actions to take
                        when a NMI is triggered.
                        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.
 
@@ -1813,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