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

Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

: (231 commits)
  [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall
  [PATCH] i386: type may be unused
  [PATCH] i386: Some additional chipset register values validation.
  [PATCH] i386: Add missing !X86_PAE dependincy to the 2G/2G split.
  [PATCH] x86-64: Don't exclude asm-offsets.c in Documentation/dontdiff
  [PATCH] i386: avoid redundant preempt_disable in __unlazy_fpu
  [PATCH] i386: white space fixes in i387.h
  [PATCH] i386: Drop noisy e820 debugging printks
  [PATCH] x86-64: Fix allnoconfig error in genapic_flat.c
  [PATCH] x86-64: Shut up warnings for vfat compat ioctls on other file systems
  [PATCH] x86-64: Share identical video.S between i386 and x86-64
  [PATCH] x86-64: Remove CONFIG_REORDER
  [PATCH] x86-64: Print type and size correctly for unknown compat ioctls
  [PATCH] i386: Remove copy_*_user BUG_ONs for (size < 0)
  [PATCH] i386: Little cleanups in smpboot.c
  [PATCH] x86-64: Don't enable NUMA for a single node in K8 NUMA scanning
  [PATCH] x86: Use RDTSCP for synchronous get_cycles if possible
  [PATCH] i386: Add X86_FEATURE_RDTSCP
  [PATCH] i386: Implement X86_FEATURE_SYNC_RDTSC on i386
  [PATCH] i386: Implement alternative_io for i386
  ...

Fix up trivial conflict in include/linux/highmem.h manually.

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parents 886a0768 35060b6a

CREDITS

+3 −2
Original line number Diff line number Diff line
@@ -1745,8 +1745,9 @@ S: D-64295 
S: Germany



N: Andi Kleen

E: ak@muc.de

D: network hacker, syncookies

E: andi@firstfloor.org

U: http://www.halobates.de

D: network, x86, NUMA, various hacks

S: Schwalbenstr. 96

S: 85551 Ottobrunn

S: Germany

Documentation/dontdiff

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ aic7*seq.h* 
aicasm

aicdb.h*

asm

asm-offsets.*

asm_offsets.*

asm-offsets.h

asm_offsets.h

autoconf.h*

bbootsect

bin2c

Documentation/i386/boot.txt

+17 −6
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
		     ----------------------------



		    H. Peter Anvin <hpa@zytor.com>

			Last update 2007-01-26

			Last update 2007-03-06



On the i386 platform, the Linux kernel uses a rather complicated boot

convention.  This has evolved partially due to historical aspects, as
@@ -35,9 +35,13 @@ Protocol 2.03: (Kernel 2.4.18-pre1) Explicitly makes the highest possible 
		initrd address available to the bootloader.



Protocol 2.04:	(Kernel 2.6.14) Extend the syssize field to four bytes.



Protocol 2.05:	(Kernel 2.6.20) Make protected mode kernel relocatable.

		Introduce relocatable_kernel and kernel_alignment fields.



Protocol 2.06:	(Kernel 2.6.22) Added a field that contains the size of

		the boot command line





**** MEMORY LAYOUT
@@ -133,6 +137,8 @@ Offset Proto Name Meaning 
022C/4	2.03+	initrd_addr_max	Highest legal initrd address

0230/4	2.05+	kernel_alignment Physical addr alignment required for kernel

0234/1	2.05+	relocatable_kernel Whether kernel is relocatable or not

0235/3	N/A	pad2		Unused

0238/4	2.06+	cmdline_size	Maximum size of the kernel command line



(1) For backwards compatibility, if the setup_sects field contains 0, the

    real value is 4.
@@ -233,6 +239,12 @@ filled out, however: 
	if your ramdisk is exactly 131072 bytes long and this field is

	0x37FFFFFF, you can start your ramdisk at 0x37FE0000.)



  cmdline_size:

	The maximum size of the command line without the terminating

	zero. This means that the command line can contain at most

	cmdline_size characters. With protocol version 2.05 and

	earlier, the maximum size was 255.





**** THE KERNEL COMMAND LINE
@@ -241,11 +253,10 @@ loader to communicate with the kernel. Some of its options are also 
relevant to the boot loader itself, see "special command line options"

below.



The kernel command line is a null-terminated string currently up to

255 characters long, plus the final null.  A string that is too long

will be automatically truncated by the kernel, a boot loader may allow

a longer command line to be passed to permit future kernels to extend

this limit.

The kernel command line is a null-terminated string. The maximum

length can be retrieved from the field cmdline_size.  Before protocol

version 2.06, the maximum was 255 characters.  A string that is too

long will be automatically truncated by the kernel.



If the boot protocol version is 2.02 or later, the address of the

kernel command line is given by the header field cmd_line_ptr (see

Documentation/kernel-parameters.txt

+19 −2
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ parameter is applicable: 
	GENERIC_TIME The generic timeofday code is enabled.

	NFS	Appropriate NFS support is enabled.

	OSS	OSS sound support is enabled.

	PV_OPS	A paravirtualized kernel

	PARIDE	The ParIDE subsystem is enabled.

	PARISC	The PA-RISC architecture is enabled.

	PCI	PCI bus support is enabled.
@@ -695,8 +696,15 @@ and is between 256 and 4096 characters. It is defined in the file 
	idebus=		[HW] (E)IDE subsystem - VLB/PCI bus speed

			See Documentation/ide.txt.



	idle=		[HW]

			Format: idle=poll or idle=halt

	idle=		[X86]

			Format: idle=poll or idle=mwait

			Poll forces a polling idle loop that can slightly improves the performance

			of waking up a idle CPU, but will use a lot of power and make the system

			run hot. Not recommended.

			idle=mwait. On systems which support MONITOR/MWAIT but the kernel chose

			to not use it because it doesn't save as much power as a normal idle

			loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same

			as idle=poll.



	ignore_loglevel	[KNL]

			Ignore loglevel setting - this will print /all/
@@ -1157,6 +1165,11 @@ and is between 256 and 4096 characters. It is defined in the file 


	nomce		[IA-32] Machine Check Exception



	noreplace-paravirt	[IA-32,PV_OPS] Don't patch paravirt_ops



	noreplace-smp	[IA-32,SMP] Don't replace SMP instructions

			with UP alternatives



	noresidual	[PPC] Don't use residual data on PReP machines.



	noresume	[SWSUSP] Disables resume and restores original swap
@@ -1562,6 +1575,9 @@ and is between 256 and 4096 characters. It is defined in the file 
	smart2=		[HW]

			Format: <io1>[,<io2>[,...,<io8>]]



	smp-alt-once	[IA-32,SMP] On a hotplug CPU system, only

			attempt to substitute SMP alternatives once at boot.



	snd-ad1816a=	[HW,ALSA]



	snd-ad1848=	[HW,ALSA]
@@ -1820,6 +1836,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			[USBHID] The interval which mice are to be polled at.



	vdso=		[IA-32,SH]

			vdso=2: enable compat VDSO (default with COMPAT_VDSO)

			vdso=1: enable VDSO (default)

			vdso=0: disable VDSO mapping

Documentation/x86_64/boot-options.txt

+13 −1
Original line number Diff line number Diff line
@@ -149,7 +149,19 @@ NUMA 


  numa=noacpi   Don't parse the SRAT table for NUMA setup



  numa=fake=X   Fake X nodes and ignore NUMA setup of the actual machine.

  numa=fake=CMDLINE

		If a number, fakes CMDLINE nodes and ignores NUMA setup of the

		actual machine.  Otherwise, system memory is configured

		depending on the sizes and coefficients listed.  For example:

			numa=fake=2*512,1024,4*256,*128

		gives two 512M nodes, a 1024M node, four 256M nodes, and the

		rest split into 128M chunks.  If the last character of CMDLINE

		is a *, the remaining memory is divided up equally among its

		coefficient:

			numa=fake=2*512,2*

		gives two 512M nodes and the rest split into two nodes.

		Otherwise, the remaining system RAM is allocated to an

		additional node.



  numa=hotadd=percent

		Only allow hotadd memory to preallocate page structures upto

CRA Git | Maintained and supported by SUSTech CRA and CCSE