Commit 807f4f8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-core-v2-for-linus' of... 

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

This merges in:

  x86/build, x86/microcode, x86/spinlocks, x86/memory-corruption-check,
  x86/early-printk, x86/xsave, x86/quirks, x86/setup, x86/signal,
  core/signal, x86/urgent, x86/xen

* 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (142 commits)
  x86: make processor type select depend on CONFIG_EMBEDDED
  x86: extend processor type select help text
  x86, amd-iommu: propagate PCI device enabling error
  warnings: fix arch/x86/kernel/io_apic_64.c
  warnings: fix arch/x86/kernel/early_printk.c
  x86, fpu: check __clear_user() return value
  x86: memory corruption check - cleanup
  x86: ioperm user_regset
  xen: do not reserve 2 pages of padding between hypervisor and fixmap.
  xen: use spin_lock_nest_lock when pinning a pagetable
  x86: xsave: set FP, SSE bits in the xsave header in the user sigcontext
  x86: xsave: fix error condition in save_i387_xstate()
  x86: SB450: deprioritize DMI quirks
  x86: SB450: skip IRQ0 override if it is not routed to INT2 of IOAPIC
  x86: replace a magic number with a named constant in the VESA boot code
  x86 setup: remove IMAGE_OFFSET
  x86 setup: remove DEF_INITSEG and DEF_SETUPSEG
  Revert "x86: fix ghost EDD devices in /sys again"
  x86 setup: fix ghost entries under /sys/firmware/edd take 3
  x86: signal: remove indent in restore_sigcontext()
  ...
parents 1a2217a9 8daf14cf

Documentation/kernel-parameters.txt

+25 −1
Original line number Diff line number Diff line
@@ -658,11 +658,12 @@ and is between 256 and 4096 characters. It is defined in the file 
	earlyprintk=	[X86-32,X86-64,SH,BLACKFIN]

			earlyprintk=vga

			earlyprintk=serial[,ttySn[,baudrate]]

			earlyprintk=dbgp



			Append ",keep" to not disable it when the real console

			takes over.



			Only vga or serial at a time, not both.

			Only vga or serial or usb debug port at a time.



			Currently only ttyS0 and ttyS1 are supported.
@@ -1231,6 +1232,29 @@ and is between 256 and 4096 characters. It is defined in the file 
			         or

			         memmap=0x10000$0x18690000



	memory_corruption_check=0/1 [X86]

			Some BIOSes seem to corrupt the first 64k of

			memory when doing things like suspend/resume.

			Setting this option will scan the memory

			looking for corruption.  Enabling this will

			both detect corruption and prevent the kernel

			from using the memory being corrupted.

			However, its intended as a diagnostic tool; if

			repeatable BIOS-originated corruption always

			affects the same memory, you can use memmap=

			to prevent the kernel from using that memory.



	memory_corruption_check_size=size [X86]

			By default it checks for corruption in the low

			64k, making this memory unavailable for normal

			use.  Use this parameter to scan for

			corruption in more or less memory.



	memory_corruption_check_period=seconds [X86]

			By default it checks for corruption every 60

			seconds.  Use this parameter to check at some

			other rate.  0 disables periodic checking.



	memtest=	[KNL,X86] Enable memtest

			Format: <integer>

			range: 0,4 : pattern number

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -390,6 +390,11 @@ L: iommu@lists.linux-foundation.org 
T:	git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git

S:	Supported



AMD MICROCODE UPDATE SUPPORT

P:      Peter Oruba

M:      peter.oruba@amd.com

S:      Supported



AMS (Apple Motion Sensor) DRIVER

P:	Stelian Pop

M:	stelian@popies.net

arch/ia64/include/asm/siginfo.h

+0 −5
Original line number Diff line number Diff line
@@ -113,11 +113,6 @@ typedef struct siginfo { 
#undef NSIGSEGV

#define NSIGSEGV	3



/*

 * SIGTRAP si_codes

 */

#define TRAP_BRANCH	(__SI_FAULT|3)	/* process taken branch trap */

#define TRAP_HWBKPT	(__SI_FAULT|4)	/* hardware breakpoint or watchpoint */

#undef NSIGTRAP

#define NSIGTRAP	4

arch/powerpc/include/asm/siginfo.h

+0 −5
Original line number Diff line number Diff line
@@ -15,11 +15,6 @@ 


#include <asm-generic/siginfo.h>



/*

 * SIGTRAP si_codes

 */

#define TRAP_BRANCH	(__SI_FAULT|3)	/* process taken branch trap */

#define TRAP_HWBKPT	(__SI_FAULT|4)	/* hardware breakpoint or watchpoint */

#undef NSIGTRAP

#define NSIGTRAP	4

arch/x86/Kconfig

+81 −9
Original line number Diff line number Diff line
@@ -778,22 +778,44 @@ config X86_REBOOTFIXUPS 
	  Say N otherwise.



config MICROCODE

	tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"

	tristate "/dev/cpu/microcode - microcode support"

	select FW_LOADER

	---help---

	  If you say Y here, you will be able to update the microcode on

	  Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II,

	  Pentium III, Pentium 4, Xeon etc.  You will obviously need the

	  actual microcode binary data itself which is not shipped with the

	  Linux kernel.

	  certain Intel and AMD processors. The Intel support is for the

	  IA32 family, e.g. Pentium Pro, Pentium II, Pentium III,

	  Pentium 4, Xeon etc. The AMD support is for family 0x10 and

	  0x11 processors, e.g. Opteron, Phenom and Turion 64 Ultra.

	  You will obviously need the actual microcode binary data itself

	  which is not shipped with the Linux kernel.



	  For latest news and information on obtaining all the required

	  ingredients for this driver, check:

	  <http://www.urbanmyth.org/microcode/>.

	  This option selects the general module only, you need to select

	  at least one vendor specific module as well.



	  To compile this driver as a module, choose M here: the

	  module will be called microcode.



config MICROCODE_INTEL

       bool "Intel microcode patch loading support"

       depends on MICROCODE

       default MICROCODE

       select FW_LOADER

       --help---

         This options enables microcode patch loading support for Intel

         processors.



         For latest news and information on obtaining all the required

         Intel ingredients for this driver, check:

         <http://www.urbanmyth.org/microcode/>.



config MICROCODE_AMD

       bool "AMD microcode patch loading support"

       depends on MICROCODE

       select FW_LOADER

       --help---

         If you select this option, microcode patch loading support for AMD

	 processors will be enabled.



   config MICROCODE_OLD_INTERFACE

	def_bool y

	depends on MICROCODE
@@ -1061,6 +1083,56 @@ config HIGHPTE 
	  low memory.  Setting this option will put user-space page table

	  entries in high memory.



config X86_CHECK_BIOS_CORRUPTION

        bool "Check for low memory corruption"

	help

	 Periodically check for memory corruption in low memory, which

	 is suspected to be caused by BIOS.  Even when enabled in the

	 configuration, it is disabled at runtime.  Enable it by

	 setting "memory_corruption_check=1" on the kernel command

	 line.  By default it scans the low 64k of memory every 60

	 seconds; see the memory_corruption_check_size and

	 memory_corruption_check_period parameters in

	 Documentation/kernel-parameters.txt to adjust this.



	 When enabled with the default parameters, this option has

	 almost no overhead, as it reserves a relatively small amount

	 of memory and scans it infrequently.  It both detects corruption

	 and prevents it from affecting the running system.



	 It is, however, intended as a diagnostic tool; if repeatable

	 BIOS-originated corruption always affects the same memory,

	 you can use memmap= to prevent the kernel from using that

	 memory.



config X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK

        bool "Set the default setting of memory_corruption_check"

	depends on X86_CHECK_BIOS_CORRUPTION

	default y

	help

	 Set whether the default state of memory_corruption_check is

	 on or off.



config X86_RESERVE_LOW_64K

        bool "Reserve low 64K of RAM on AMI/Phoenix BIOSen"

	default y

	help

	 Reserve the first 64K of physical RAM on BIOSes that are known

	 to potentially corrupt that memory range. A numbers of BIOSes are

	 known to utilize this area during suspend/resume, so it must not

	 be used by the kernel.



	 Set this to N if you are absolutely sure that you trust the BIOS

	 to get all its memory reservations and usages right.



	 If you have doubts about the BIOS (e.g. suspend/resume does not

	 work or there's kernel crashes after certain hardware hotplug

	 events) and it's not AMI or Phoenix, then you might want to enable

	 X86_CHECK_BIOS_CORRUPTION=y to allow the kernel to check typical

	 corruption patterns.



	 Say Y if unsure.



config MATH_EMULATION

	bool

	prompt "Math emulation" if X86_32

CRA Git | Maintained and supported by SUSTech CRA and CCSE