Documentation: update panic parameter info

Add a little more info for some of the panic-related kernel parameters.
Fix "oops=panic" to fit in 80 columns.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Reviewed-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c357a31411cdb98978153eb5de0ecb2db025648f..f2e5f3f72c8d46469c797bff796a8cd175e583d4 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1832,15 +1832,17 @@ 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.
+       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
 
-       panic=          [KNL] Kernel behaviour on panic
+       panic=          [KNL] Kernel behaviour on panic: delay <timeout>
+                       seconds before rebooting
                        Format: <timeout>
 
        parkbd.port=    [HW] Parallel port number the keyboard adapter is
@@ -2343,6 +2345,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        softlockup_panic=
                        [KNL] Should the soft-lockup detector generate panics.
+                       Format: <integer>
 
        sonypi.*=       [HW] Sony Programmable I/O Control Device driver
                        See Documentation/sonypi.txt
@@ -2529,8 +2532,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        reported either.
 
        unknown_nmi_panic
-                       [X86]
-                       Set unknown_nmi_panic=1 early on boot.
+                       [X86] Cause panic on unknown NMI.
 
        usbcore.autosuspend=
                        [USB] The autosuspend time delay (in seconds) used