Commit d61ec845 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'please-pull-move-cper' of... 

Merge tag 'please-pull-move-cper' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

 into x86/mce

Pull source-file movement patch from Tony Luck:

  "cper.c implements UEFI Appendix N "Common Platform Error Record"
   handling. Move it to drivers/firmware/efi/cper.c to reflect this
   heritage."

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d6952578 7ea6c6c1

drivers/acpi/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -374,7 +374,9 @@ source "drivers/acpi/apei/Kconfig" 


config ACPI_EXTLOG

	tristate "Extended Error Log support"

	depends on X86_MCE && ACPI_APEI

	depends on X86_MCE

	select EFI

	select UEFI_CPER

	default n

	help

	  Certain usages such as Predictive Failure Analysis (PFA) require

drivers/acpi/apei/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ config ACPI_APEI 
	bool "ACPI Platform Error Interface (APEI)"

	select MISC_FILESYSTEMS

	select PSTORE

	select EFI

	select UEFI_CPER

	depends on X86

	help

	  APEI allows to report errors (for example from the chipset)

drivers/acpi/apei/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ obj-$(CONFIG_ACPI_APEI_GHES) += ghes.o 
obj-$(CONFIG_ACPI_APEI_EINJ)	+= einj.o

obj-$(CONFIG_ACPI_APEI_ERST_DEBUG) += erst-dbg.o



apei-y := apei-base.o hest.o cper.o erst.o
 
apei-y := apei-base.o hest.o erst.o

drivers/firmware/efi/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -36,4 +36,7 @@ config EFI_VARS_PSTORE_DEFAULT_DISABLE 
	  backend for pstore by default. This setting can be overridden

	  using the efivars module's pstore_disable parameter.



config UEFI_CPER

	def_bool n



endmenu

drivers/firmware/efi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 
obj-y					+= efi.o vars.o

obj-$(CONFIG_EFI_VARS)			+= efivars.o

obj-$(CONFIG_EFI_VARS_PSTORE)		+= efi-pstore.o

obj-$(CONFIG_UEFI_CPER)			+= cper.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE