Skip to content

Commit

Permalink
Move cper.c from drivers/acpi/apei to drivers/firmware/efi
Browse files Browse the repository at this point in the history
cper.c contains code to decode and print "Common Platform Error Records".
Originally added under drivers/acpi/apei because the only user was in that
same directory - but now we have another consumer, and we shouldn't have
to force CONFIG_ACPI_APEI get access to this code.

Since CPER is defined in the UEFI specification - the logical home for
this code is under drivers/firmware/efi/

Acked-by: Matt Fleming <matt.fleming@intel.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Luck, Tony committed Oct 31, 2013
1 parent 5650769 commit 7ea6c6c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 2 deletions.
4 changes: 3 additions & 1 deletion drivers/acpi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions drivers/acpi/apei/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/apei/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions drivers/firmware/efi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions drivers/firmware/efi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.

0 comments on commit 7ea6c6c

Please sign in to comment.