diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-01 09:02:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-01 09:02:44 +0100 |
| commit | d61ec845e2a2e2763aad3ee3024003ce1bb832cf (patch) | |
| tree | 9dec35716b5d6ae3cad036c28a5bc77c141dee44 /drivers | |
| parent | d69525789e3256968a3867f70015903523c195e3 (diff) | |
| parent | 7ea6c6c15ee16f4c7f5eeaa62f77e696f85ae0d1 (diff) | |
| download | linux-d61ec845e2a2e2763aad3ee3024003ce1bb832cf.tar.gz linux-d61ec845e2a2e2763aad3ee3024003ce1bb832cf.tar.bz2 linux-d61ec845e2a2e2763aad3ee3024003ce1bb832cf.zip | |
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: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/acpi/apei/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/acpi/apei/Makefile | 2 | ||||
| -rw-r--r-- | drivers/firmware/efi/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/firmware/efi/Makefile | 1 | ||||
| -rw-r--r-- | drivers/firmware/efi/cper.c (renamed from drivers/acpi/apei/cper.c) | 0 |
6 files changed, 10 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 252f0e818a49..08eadb4a57cb 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -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 diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig index f0c1ce95a0ec..786294bb682c 100644 --- a/drivers/acpi/apei/Kconfig +++ b/drivers/acpi/apei/Kconfig @@ -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) diff --git a/drivers/acpi/apei/Makefile b/drivers/acpi/apei/Makefile index d1d1bc0a4ee1..5d575a955940 100644 --- a/drivers/acpi/apei/Makefile +++ b/drivers/acpi/apei/Makefile @@ -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 diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index b0fc7c79dfbb..3150aa4874e8 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -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 diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile index 99245ab5a79c..9ba156d3c775 100644 --- a/drivers/firmware/efi/Makefile +++ b/drivers/firmware/efi/Makefile @@ -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 diff --git a/drivers/acpi/apei/cper.c b/drivers/firmware/efi/cper.c index 1491dd4f08f9..1491dd4f08f9 100644 --- a/drivers/acpi/apei/cper.c +++ b/drivers/firmware/efi/cper.c |