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

Commit d0e323b4 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'apei' into apei-release 



Some trivial conflicts due to other various merges
adding to the end of common lists sooner than this one.

	arch/ia64/Kconfig
	arch/powerpc/Kconfig
	arch/x86/Kconfig
	lib/Kconfig
	lib/Makefile

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents c027a474 c3e6088e

Documentation/acpi/apei/einj.txt

+9 −2
Original line number Diff line number Diff line
@@ -48,12 +48,19 @@ directory apei/einj. The following files are provided. 
- param1

  This file is used to set the first error parameter value. Effect of

  parameter depends on error_type specified. For memory error, this is

  physical memory address.

  physical memory address.  Only available if param_extension module

  parameter is specified.



- param2

  This file is used to set the second error parameter value. Effect of

  parameter depends on error_type specified. For memory error, this is

  physical memory address mask.

  physical memory address mask.  Only available if param_extension

  module parameter is specified.



Injecting parameter support is a BIOS version specific extension, that

is, it only works on some BIOS version.  If you want to use it, please

make sure your BIOS version has the proper support and specify

"param_extension=y" in module parameter.



For more information about EINJ, please refer to ACPI specification

version 4.0, section 17.5.

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -178,4 +178,7 @@ config HAVE_ARCH_MUTEX_CPU_RELAX 
config HAVE_RCU_TABLE_FREE

	bool



config ARCH_HAVE_NMI_SAFE_CMPXCHG

	bool



source "kernel/gcov/Kconfig"

arch/alpha/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config ALPHA 
	select AUTO_IRQ_AFFINITY if SMP

	select GENERIC_IRQ_SHOW

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	help

	  The Alpha is a 64-bit general-purpose processor designed and

	  marketed by the Digital Equipment Corporation of blessed memory,

arch/avr32/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config AVR32 
	select GENERIC_IRQ_PROBE

	select HARDIRQS_SW_RESEND

	select GENERIC_IRQ_SHOW

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	help

	  AVR32 is a high-performance 32-bit RISC microprocessor core,

	  designed for cost-sensitive embedded applications, with particular

arch/frv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config FRV 
	select HAVE_PERF_EVENTS

	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_SHOW

	select ARCH_HAVE_NMI_SAFE_CMPXCHG



config ZONE_DMA

	bool