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

Commit 8bd93ca7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, gart: fix gart detection for Fam11h CPUs
  x86: 64 bit print out absent pages num too
  x86, kdump: fix invalid access on i386 sparsemem
  x86: fix APIC_DEBUG with inquire_remote_apic
  x86: AMD microcode patch loader author update
  x86: microcode patch loader author update
  mailmap: add Peter Oruba
  x86, bts: improve help text for BTS config
  doc/x86: fix doc subdirs
parents 7f82f000 87c6f401

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ Nguyen Anh Quynh <aquynh@gmail.com> 
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>

Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter@oruba.de>

Peter Oruba <peter.oruba@amd.com>

Praveen BP <praveenbp@ti.com>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ i2c/ 
	- directory with info about the I2C bus/protocol (2 wire, kHz speed).

i2o/

	- directory with info about the Linux I2O subsystem.

i386/

x86/i386/

	- directory with info about Linux on Intel 32 bit architecture.

ia64/

	- directory with info about Linux on Intel 64 bit architecture.
@@ -382,7 +382,7 @@ w1/ 
	- directory with documents regarding the 1-wire (w1) subsystem.

watchdog/

	- how to auto-reboot Linux if it has "fallen and can't get up". ;-)

x86_64/

x86/x86_64/

	- directory with info on Linux support for AMD x86-64 (Hammer) machines.

zorro.txt

	- info on writing drivers for Zorro bus devices found on Amigas.

Documentation/kernel-parameters.txt

+6 −6
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ parameter is applicable: 
	X86-32	X86-32, aka i386 architecture is enabled.

	X86-64	X86-64 architecture is enabled.

			More X86-64 boot options can be found in

			Documentation/x86_64/boot-options.txt .

			Documentation/x86/x86_64/boot-options.txt .

	X86	Either 32bit or 64bit x86 (same as X86-32+X86-64)



In addition, the following text indicates that the option:
@@ -112,10 +112,10 @@ In addition, the following text indicates that the option: 
Parameters denoted with BOOT are actually interpreted by the boot

loader, and have no meaning to the kernel directly.

Do not modify the syntax of boot loader parameters without extreme

need or coordination with <Documentation/i386/boot.txt>.

need or coordination with <Documentation/x86/i386/boot.txt>.



There are also arch-specific kernel-parameters not documented here.

See for example <Documentation/x86_64/boot-options.txt>.

See for example <Documentation/x86/x86_64/boot-options.txt>.



Note that ALL kernel parameters listed below are CASE SENSITIVE, and that

a trailing = on the name of any parameter states that that parameter will
@@ -1222,7 +1222,7 @@ and is between 256 and 4096 characters. It is defined in the file 


	mce		[X86-32] Machine Check Exception



	mce=option	[X86-64] See Documentation/x86_64/boot-options.txt

	mce=option	[X86-64] See Documentation/x86/x86_64/boot-options.txt



	md=		[HW] RAID subsystems devices and level

			See Documentation/md.txt.
@@ -1728,7 +1728,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			See Documentation/paride.txt.



	pirq=		[SMP,APIC] Manual mp-table setup

			See Documentation/i386/IO-APIC.txt.

			See Documentation/x86/i386/IO-APIC.txt.



	plip=		[PPT,NET] Parallel port network link

			Format: { parport<nr> | timid | 0 }
@@ -2343,7 +2343,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			See Documentation/fb/modedb.txt.



	vga=		[BOOT,X86-32] Select a particular video mode

			See Documentation/i386/boot.txt and

			See Documentation/x86/i386/boot.txt and

			Documentation/svga.txt.

			Use vga=ask for menu.

			This is actually a boot loader parameter; the value is

Documentation/lguest/lguest.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static unsigned long load_bzimage(int fd) 
	void *p = from_guest_phys(0x100000);



	/* Go back to the start of the file and read the header.  It should be

	 * a Linux boot header (see Documentation/i386/boot.txt) */

	 * a Linux boot header (see Documentation/x86/i386/boot.txt) */

	lseek(fd, 0, SEEK_SET);

	read(fd, &boot, sizeof(boot));

Documentation/x86/x86_64/boot-options.txt

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ APICs 


   nolapic	 Don't use the local APIC (alias for i386 compatibility)



   pirq=...	 See Documentation/i386/IO-APIC.txt

   pirq=...	 See Documentation/x86/i386/IO-APIC.txt



   noapictimer	 Don't set up the APIC timer
@@ -139,7 +139,7 @@ Non Executable Mappings 
SMP



  additional_cpus=NUM Allow NUM more CPUs for hotplug

		 (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec)

		 (defaults are specified by the BIOS, see Documentation/x86/x86_64/cpu-hotplug-spec)



NUMA