Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4af94f39 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
cc: Ingo Molnar <mingo@elte.hu>
cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a21e2553
Loading
Loading
Loading
Loading
+38 −0
Original line number Original line Diff line number Diff line
@@ -231,6 +231,35 @@ and is between 256 and 4096 characters. It is defined in the file
 			power state again in power transition.
 			power state again in power transition.
 			1 : disable the power state check
 			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]
	acpi_enforce_resources=	[ACPI]
			{ strict | lax | no }
			{ strict | lax | no }
			Check for resource conflicts between native drivers
			Check for resource conflicts between native drivers
@@ -250,6 +279,9 @@ and is between 256 and 4096 characters. It is defined in the file
	ad1848=		[HW,OSS]
	ad1848=		[HW,OSS]
			Format: <io>,<irq>,<dma>,<dma2>,<type>
			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]
	advansys=	[HW,SCSI]
			See header of drivers/scsi/advansys.c.
			See header of drivers/scsi/advansys.c.


@@ -1838,6 +1870,12 @@ and is between 256 and 4096 characters. It is defined in the file
			autoconfiguration.
			autoconfiguration.
			Ranges are in pairs (memory base and size).
			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=
	print-fatal-signals=
			[KNL] debug: print fatal signals
			[KNL] debug: print fatal signals
			print-fatal-signals=1: print segfault info to
			print-fatal-signals=1: print segfault info to