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>

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 · Linus Torvalds
1 parent 41c57892a2
Showing 1 changed file with 7 additions and 5 deletions Side-by-side Diff
Documentation/kernel-parameters.txt
@@ -1832,15 +1832,17 @@
 				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 @@
  
 	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 @@
 			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
...	...	@@ -1832,15 +1832,17 @@
1832	1832	perfmon on Intel CPUs instead of the
1833	1833	CPU specific event set.
1834	1834
1835		- oops=panic Always panic on oopses. Default is to just kill the process,
1836		- but there is a small probability of deadlocking the machine.
	1835	+ oops=panic Always panic on oopses. Default is to just kill the
	1836	+ process, but there is a small probability of
	1837	+ deadlocking the machine.
1837	1838	This will also cause panics on machine check exceptions.
1838	1839	Useful together with panic=30 to trigger a reboot.
1839	1840
1840	1841	OSS [HW,OSS]
1841	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	1846	Format: <timeout>
1845	1847
1846	1848	parkbd.port= [HW] Parallel port number the keyboard adapter is
...	...	@@ -2343,6 +2345,7 @@
2343	2345
2344	2346	softlockup_panic=
2345	2347	[KNL] Should the soft-lockup detector generate panics.
	2348	+ Format: <integer>
2346	2349
2347	2350	sonypi.*= [HW] Sony Programmable I/O Control Device driver
2348	2351	See Documentation/sonypi.txt
...	...	@@ -2529,8 +2532,7 @@
2529	2532	reported either.
2530	2533
2531	2534	unknown_nmi_panic
2532		- [X86]
2533		- Set unknown_nmi_panic=1 early on boot.
	2535	+ [X86] Cause panic on unknown NMI.
2534	2536
2535	2537	usbcore.autosuspend=
2536	2538	[USB] The autosuspend time delay (in seconds) used