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

Commit e496e3d6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline',... 

Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1
parents b159d7a9 5bbd4c37 175e438f 516cbf37 af2d237b 9b156845 5b7e41ff 1befdefc a03352d2 7b22ff53 2c7e9fd4 91030ca1 dd552355 b3e15bde 20211e4d efd327a2 c7ffa6c2 e51a1ac2 5df45515 d99e9016 e621bd18

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/

Documentation/kernel-parameters.txt

+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.

Documentation/x86/00-INDEX

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

Documentation/x86/i386/boot.txt→Documentation/x86/boot.txt

+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.

Documentation/mtrr.txt→Documentation/x86/mtrr.txt

+2 −2

File changed and moved.

Contains only whitespace changes.