Эх сурвалжийг харах

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>
Randy Dunlap 14 жил өмнө
parent
commit
44a4dcf75c

+ 7 - 5
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
 				perfmon on Intel CPUs instead of the
 				CPU specific event set.
 				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.
 			This will also cause panics on machine check exceptions.
 			Useful together with panic=30 to trigger a reboot.
 			Useful together with panic=30 to trigger a reboot.
 
 
 	OSS		[HW,OSS]
 	OSS		[HW,OSS]
 			See Documentation/sound/oss/oss-parameters.txt
 			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>
 			Format: <timeout>
 
 
 	parkbd.port=	[HW] Parallel port number the keyboard adapter is
 	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=
 	softlockup_panic=
 			[KNL] Should the soft-lockup detector generate panics.
 			[KNL] Should the soft-lockup detector generate panics.
+			Format: <integer>
 
 
 	sonypi.*=	[HW] Sony Programmable I/O Control Device driver
 	sonypi.*=	[HW] Sony Programmable I/O Control Device driver
 			See Documentation/sonypi.txt
 			See Documentation/sonypi.txt
@@ -2529,8 +2532,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			reported either.
 			reported either.
 
 
 	unknown_nmi_panic
 	unknown_nmi_panic
-			[X86]
-			Set unknown_nmi_panic=1 early on boot.
+			[X86] Cause panic on unknown NMI.
 
 
 	usbcore.autosuspend=
 	usbcore.autosuspend=
 			[USB] The autosuspend time delay (in seconds) used
 			[USB] The autosuspend time delay (in seconds) used