aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2011-04-04 18:02:24 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-04 20:51:47 -0400
commit44a4dcf75c58157a5d036ff783dfb2254703b93e (patch)
treec19ee506ff5067a2d22f5273853d892dcc1ec2af /Documentation
parent41c57892a2895865afc89ff1a21f91a0f1506f66 (diff)
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c357a31411cd..f2e5f3f72c8d 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1832,15 +1832,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
1832 perfmon on Intel CPUs instead of the 1832 perfmon on Intel CPUs instead of the
1833 CPU specific event set. 1833 CPU specific event set.
1834 1834
1835 oops=panic Always panic on oopses. Default is to just kill the process, 1835 oops=panic Always panic on oopses. Default is to just kill the
1836 but there is a small probability of deadlocking the machine. 1836 process, but there is a small probability of
1837 deadlocking the machine.
1837 This will also cause panics on machine check exceptions. 1838 This will also cause panics on machine check exceptions.
1838 Useful together with panic=30 to trigger a reboot. 1839 Useful together with panic=30 to trigger a reboot.
1839 1840
1840 OSS [HW,OSS] 1841 OSS [HW,OSS]
1841 See Documentation/sound/oss/oss-parameters.txt 1842 See Documentation/sound/oss/oss-parameters.txt
1842 1843
1843 panic= [KNL] Kernel behaviour on panic 1844 panic= [KNL] Kernel behaviour on panic: delay <timeout>
1845 seconds before rebooting
1844 Format: <timeout> 1846 Format: <timeout>
1845 1847
1846 parkbd.port= [HW] Parallel port number the keyboard adapter is 1848 parkbd.port= [HW] Parallel port number the keyboard adapter is
@@ -2343,6 +2345,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
2343 2345
2344 softlockup_panic= 2346 softlockup_panic=
2345 [KNL] Should the soft-lockup detector generate panics. 2347 [KNL] Should the soft-lockup detector generate panics.
2348 Format: <integer>
2346 2349
2347 sonypi.*= [HW] Sony Programmable I/O Control Device driver 2350 sonypi.*= [HW] Sony Programmable I/O Control Device driver
2348 See Documentation/sonypi.txt 2351 See Documentation/sonypi.txt
@@ -2529,8 +2532,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
2529 reported either. 2532 reported either.
2530 2533
2531 unknown_nmi_panic 2534 unknown_nmi_panic
2532 [X86] 2535 [X86] Cause panic on unknown NMI.
2533 Set unknown_nmi_panic=1 early on boot.
2534 2536
2535 usbcore.autosuspend= 2537 usbcore.autosuspend=
2536 [USB] The autosuspend time delay (in seconds) used 2538 [USB] The autosuspend time delay (in seconds) used