diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-06-01 15:46:45 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-06-01 15:46:45 +1000 |
| commit | 1466c8f6ab0c77b68b517ba1da6a8a04c3cf8d22 (patch) | |
| tree | 6aa7ba5ef3eccb90e6cec3c0f0d5183cc926bf1c /include/acpi | |
| parent | c0097f60efaa6afabc9d0d5808091a515be5d7e3 (diff) | |
| parent | eaa3a1d46cfdbf1af50311e7a22f5d38c0418b56 (diff) | |
Merge remote-tracking branch 'edac-amd/for-next'
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/ghes.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h index 8feb0c866ee0..1624e2be485c 100644 --- a/include/acpi/ghes.h +++ b/include/acpi/ghes.h @@ -55,22 +55,21 @@ enum { /* From drivers/edac/ghes_edac.c */ #ifdef CONFIG_EDAC_GHES -void ghes_edac_report_mem_error(struct ghes *ghes, int sev, - struct cper_sec_mem_err *mem_err); +void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err); int ghes_edac_register(struct ghes *ghes, struct device *dev); void ghes_edac_unregister(struct ghes *ghes); #else -static inline void ghes_edac_report_mem_error(struct ghes *ghes, int sev, +static inline void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) { } static inline int ghes_edac_register(struct ghes *ghes, struct device *dev) { - return 0; + return -ENODEV; } static inline void ghes_edac_unregister(struct ghes *ghes) |