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

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>

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 252f0e8..08eadb4 100644 (file)
--- 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 f0c1ce9..786294b 100644 (file)
--- 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 d1d1bc0..5d575a9 100644 (file)
--- 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 b0fc7c7..3150aa4 100644 (file)
--- 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 99245ab..9ba156d 100644 (file)
--- 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
similarity index 100%
rename from drivers/acpi/apei/cper.c
rename to drivers/firmware/efi/cper.c