doc: fix kernel-parameters.txt mistaken deletions

Re-add missing kernel-parameters documentation that was accidentally deleted in commit 0cb55ad2. Thanks to Ingo and Weidong Han for the heads-up on this. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> cc: Ingo Molnar <mingo@elte.hu> cc: Len Brown <lenb@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

doc: fix kernel-parameters.txt mistaken deletions
Re-add missing kernel-parameters documentation that was accidentally deleted in commit 0cb55ad2. Thanks to Ingo and Weidong Han for the heads-up on this. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> cc: Ingo Molnar <mingo@elte.hu> cc: Len Brown <lenb@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Randy Dunlap · Linus Torvalds
1 parent a21e255361
Showing 1 changed file with 38 additions and 0 deletions Side-by-side Diff
Documentation/kernel-parameters.txt
@@ -231,6 +231,35 @@
  			power state again in power transition.
  			1 : disable the power state check
  
+	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode
+			Format: { level | edge | high | low }
+
+	acpi_serialize	[HW,ACPI] force serialization of AML methods
+
+	acpi_skip_timer_override [HW,ACPI]
+			Recognize and ignore IRQ0/pin2 Interrupt Override.
+			For broken nForce2 BIOS resulting in XT-PIC timer.
+
+	acpi_sleep=	[HW,ACPI] Sleep options
+			Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
+				  old_ordering, s4_nonvs }
+			See Documentation/power/video.txt for information on
+			s3_bios and s3_mode.
+			s3_beep is for debugging; it makes the PC's speaker beep
+			as soon as the kernel's real-mode entry point is called.
+			s4_nohwsig prevents ACPI hardware signature from being
+			used during resume from hibernation.
+			old_ordering causes the ACPI 1.0 ordering of the _PTS
+			control method, with respect to putting devices into
+			low power states, to be enforced (the ACPI 2.0 ordering
+			of _PTS is used by default).
+			s4_nonvs prevents the kernel from saving/restoring the
+			ACPI NVS memory during hibernation.
+
+	acpi_use_timer_override [HW,ACPI]
+			Use timer override. For some broken Nvidia NF5 boards
+			that require a timer override, but don't have HPET
+
 	acpi_enforce_resources=	[ACPI]
 			{ strict | lax | no }
 			Check for resource conflicts between native drivers
@@ -250,6 +279,9 @@
 	ad1848=		[HW,OSS]
 			Format: <io>,<irq>,<dma>,<dma2>,<type>
  
+	add_efi_memmap	[EFI; X86] Include EFI memory map in
+			kernel's map of available physical RAM.
+
 	advansys=	[HW,SCSI]
 			See header of drivers/scsi/advansys.c.
  
@@ -1837,6 +1869,12 @@
 			[ISAPNP] Exclude memory regions for the
 			autoconfiguration.
 			Ranges are in pairs (memory base and size).
+
+	ports=		[IP_VS_FTP] IPVS ftp helper module
+			Default is 21.
+			Up to 8 (IP_VS_APP_MAX_PORTS) ports
+			may be specified.
+			Format: <port>,<port>....
  
 	print-fatal-signals=
 			[KNL] debug: print fatal signals
...	...	@@ -231,6 +231,35 @@
231	231	power state again in power transition.
232	232	1 : disable the power state check
233	233
	234	+ acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode
	235	+ Format: { level \| edge \| high \| low }
	236	+
	237	+ acpi_serialize [HW,ACPI] force serialization of AML methods
	238	+
	239	+ acpi_skip_timer_override [HW,ACPI]
	240	+ Recognize and ignore IRQ0/pin2 Interrupt Override.
	241	+ For broken nForce2 BIOS resulting in XT-PIC timer.
	242	+
	243	+ acpi_sleep= [HW,ACPI] Sleep options
	244	+ Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
	245	+ old_ordering, s4_nonvs }
	246	+ See Documentation/power/video.txt for information on
	247	+ s3_bios and s3_mode.
	248	+ s3_beep is for debugging; it makes the PC's speaker beep
	249	+ as soon as the kernel's real-mode entry point is called.
	250	+ s4_nohwsig prevents ACPI hardware signature from being
	251	+ used during resume from hibernation.
	252	+ old_ordering causes the ACPI 1.0 ordering of the _PTS
	253	+ control method, with respect to putting devices into
	254	+ low power states, to be enforced (the ACPI 2.0 ordering
	255	+ of _PTS is used by default).
	256	+ s4_nonvs prevents the kernel from saving/restoring the
	257	+ ACPI NVS memory during hibernation.
	258	+
	259	+ acpi_use_timer_override [HW,ACPI]
	260	+ Use timer override. For some broken Nvidia NF5 boards
	261	+ that require a timer override, but don't have HPET
	262	+
234	263	acpi_enforce_resources= [ACPI]
235	264	{ strict \| lax \| no }
236	265	Check for resource conflicts between native drivers
...	...	@@ -250,6 +279,9 @@
250	279	ad1848= [HW,OSS]
251	280	Format: <io>,<irq>,<dma>,<dma2>,<type>
252	281
	282	+ add_efi_memmap [EFI; X86] Include EFI memory map in
	283	+ kernel's map of available physical RAM.
	284	+
253	285	advansys= [HW,SCSI]
254	286	See header of drivers/scsi/advansys.c.
255	287
...	...	@@ -1837,6 +1869,12 @@
1837	1869	[ISAPNP] Exclude memory regions for the
1838	1870	autoconfiguration.
1839	1871	Ranges are in pairs (memory base and size).
	1872	+
	1873	+ ports= [IP_VS_FTP] IPVS ftp helper module
	1874	+ Default is 21.
	1875	+ Up to 8 (IP_VS_APP_MAX_PORTS) ports
	1876	+ may be specified.
	1877	+ Format: <port>,<port>....
1840	1878
1841	1879	print-fatal-signals=
1842	1880	[KNL] debug: print fatal signals