Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline',... (e496e3d6) · Commits · 戴 / test

Documentation/00-INDEX

+0 −2

Original line number	Diff line number	Diff line
		@@ -251,8 +251,6 @@ mono.txt
		- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
		moxa-smartio
		- file with info on installing/using Moxa multiport serial driver.
		mtrr.txt
		- how to use PPro Memory Type Range Registers to increase performance.
		mutex-design.txt
		- info on the generic mutex subsystem.
		namespaces/

+6 −6

Original line number	Diff line number	Diff line
		@@ -463,12 +463,6 @@ and is between 256 and 4096 characters. It is defined in the file
		Range: 0 - 8192
		Default: 64

		disable_8254_timer
		enable_8254_timer
		[IA32/X86_64] Disable/Enable interrupt 0 timer routing
		over the 8254 in addition to over the IO-APIC. The
		kernel tries to set a sensible default.

		hpet= [X86-32,HPET] option to control HPET usage
		Format: { enable (default) \| disable \| force }
		disable: disable HPET and use PIT instead
		@@ -1882,6 +1876,12 @@ and is between 256 and 4096 characters. It is defined in the file
		shapers= [NET]
		Maximal number of shapers.

		show_msr= [x86] show boot-time MSR settings
		Format: { <integer> }
		Show boot-time (BIOS-initialized) MSR settings.
		The parameter means the number of CPUs to show,
		for example 1 means boot CPU only.

		sim710= [SCSI,HW]
		See header of drivers/scsi/sim710.c.

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		00-INDEX
		- this file
		mtrr.txt
		- how to use x86 Memory Type Range Registers to increase performance

+1 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ Protocol: 2.00+

		Field name: start_sys
		Type: read
		Offset/size: 0x20c/4
		Offset/size: 0x20c/2
		Protocol: 2.00+

		The load low segment (0x1000). Obsolete.

+2 −2

File changed and moved.

Contains only whitespace changes.