diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-06-26 12:54:27 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-06-26 12:54:27 +0300 |
| commit | 3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb (patch) | |
| tree | 81e5823a1c84a0131dc110f711f3c1416b4df985 /include/linux/ras.h | |
| parent | 9ad95c46c18ba828dfcf467024a45eb5b43ce769 (diff) | |
| parent | 77b246b32b2c4bc21e352dcb8b53a8aba81ee5a4 (diff) | |
| download | linux-3edb1dd13ce6f6480c1f2bffc47a49cf959fa9cb.tar.xz | |
Merge branch 'aarch64/for-next/ras-apei' into aarch64/for-next/core
Merge in arm64 ACPI RAS support (APEI/GHES) from Tyler Baicar.
Diffstat (limited to 'include/linux/ras.h')
| -rw-r--r-- | include/linux/ras.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/ras.h b/include/linux/ras.h index ffb147185e8d..7d61863ff265 100644 --- a/include/linux/ras.h +++ b/include/linux/ras.h @@ -2,6 +2,8 @@ #define __RAS_H__ #include <asm/errno.h> +#include <linux/uuid.h> +#include <linux/cper.h> #ifdef CONFIG_DEBUG_FS int ras_userspace_consumers(void); @@ -22,4 +24,17 @@ static inline void __init cec_init(void) { } static inline int cec_add_elem(u64 pfn) { return -ENODEV; } #endif +#ifdef CONFIG_RAS +void log_non_standard_event(const guid_t *sec_type, + const guid_t *fru_id, const char *fru_text, + const u8 sev, const u8 *err, const u32 len); +void log_arm_hw_error(struct cper_sec_proc_arm *err); +#else +static void log_non_standard_event(const guid_t *sec_type, + const guid_t *fru_id, const char *fru_text, + const u8 sev, const u8 *err, + const u32 len) { return; } +static void log_arm_hw_error(struct cper_sec_proc_arm *err) { return; } +#endif + #endif /* __RAS_H__ */ |