diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 14:41:50 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-05 14:41:50 +1000 |
commit | 44136407882227374c1afda8b9d7943c3f353582 (patch) | |
tree | a325ebef86db45c2b5cd050d68c918eac3ea9ee4 /include/acpi | |
parent | 3752da63d9756b81dcb58b9f0111a491fc89b5d6 (diff) | |
parent | 14ff37b47402dde1304afb9c4d4ca6ecf0c68a47 (diff) |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/Kconfig
drivers/acpi/acpi_extlog.c
drivers/net/wireless/ath/ath9k/hw.c
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/apei.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/acpi/apei.h b/include/acpi/apei.h index 04f349d8da73..76284bb560a6 100644 --- a/include/acpi/apei.h +++ b/include/acpi/apei.h @@ -42,5 +42,9 @@ ssize_t erst_read(u64 record_id, struct cper_record_header *record, size_t buflen); int erst_clear(u64 record_id); +int arch_apei_enable_cmcff(struct acpi_hest_header *hest_hdr, void *data); +void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err); +void arch_apei_flush_tlb_one(unsigned long addr); + #endif #endif |