Commit d403a648 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge phase #1 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

This merges phase 1 of the x86 tree, which is a collection of 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

and as Ingo says: "these are the easiest, purely independent x86 topics
with no conflicts, in one nice Octopus merge".

* 'x86-v28-for-linus-phase1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (147 commits)
  x86: mtrr_cleanup: treat WRPROT as UNCACHEABLE
  x86: mtrr_cleanup: first 1M may be covered in var mtrrs
  x86: mtrr_cleanup: print out correct type v2
  x86: trivial printk fix in efi.c
  x86, debug: mtrr_cleanup print out var mtrr before change it
  x86: mtrr_cleanup try gran_size to less than 1M, v3
  x86: mtrr_cleanup try gran_size to less than 1M, cleanup
  x86: change MTRR_SANITIZER to def_bool y
  x86, debug printouts: IOMMU setup failures should not be KERN_ERR
  x86: export set_memory_ro and set_memory_rw
  x86: mtrr_cleanup try gran_size to less than 1M
  x86: mtrr_cleanup prepare to make gran_size to less 1M
  x86: mtrr_cleanup safe to get more spare regs now
  x86_64: be less annoying on boot, v2
  x86: mtrr_cleanup hole size should be less than half of chunk_size, v2
  x86: add mtrr_cleanup_debug command line
  x86: mtrr_cleanup optimization, v2
  x86: don't need to go to chunksize to 4G
  x86_64: be less annoying on boot
  x86, olpc: fix endian bug in openfirmware workaround
  ...
parents ed458df4 e496e3d6

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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE