summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/apei
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-01-12 17:56:29 +0100
committerIngo Molnar <mingo@kernel.org>2014-01-12 17:56:29 +0100
commitda4540757d35a98a350d6e8d882a64b2d04f8581 (patch)
treead77d8752f5db40497c819f051cbae12effb8163 /drivers/acpi/apei
parentcc131eef1cec905b9bdb0be6d7ab3af86f23de98 (diff)
parent7e22e91102c6b9df7c4ae2168910e19d2bb14cd6 (diff)
downloadlinux-da4540757d35a98a350d6e8d882a64b2d04f8581.tar.gz
linux-da4540757d35a98a350d6e8d882a64b2d04f8581.tar.bz2
linux-da4540757d35a98a350d6e8d882a64b2d04f8581.zip
Merge tag 'v3.13-rc8' into x86/ras, to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/acpi/apei')
-rw-r--r--drivers/acpi/apei/Kconfig1
-rw-r--r--drivers/acpi/apei/erst.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig
index 786294bb682c..3650b2183227 100644
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
@@ -2,7 +2,6 @@ config ACPI_APEI
bool "ACPI Platform Error Interface (APEI)"
select MISC_FILESYSTEMS
select PSTORE
- select EFI
select UEFI_CPER
depends on X86
help
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 26311f23c824..cb1d557fc22c 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -942,6 +942,7 @@ static int erst_clearer(enum pstore_type_id type, u64 id, int count,
static struct pstore_info erst_info = {
.owner = THIS_MODULE,
.name = "erst",
+ .flags = PSTORE_FLAGS_FRAGILE,
.open = erst_open_pstore,
.close = erst_close_pstore,
.read = erst_reader,