ACPI, APEI, Rename CPER and GHES severity constants
PATCH 1/1 ACPI, APEI, Rename CPER and GHES severity constants
The abbreviation of severity should be SEV instead of SER, so the CPER severity constants are renamed accordingly. GHES severity constants are renamed in the same way too.
Signed-off-by Huang Ying <[email protected]>
--- arch/x86/kernel/cpu/mcheck/mce-apei.c | 4 ++-- drivers/acpi/apei/ghes.c | 32 ++++++++++++++++---------------- include/linux/cper.h | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-)
arch/x86/kernel/cpu/mcheck/mce-apei.c +2 -2
@@ -80,7 +80,7 @@ int apei_write_mce(struct mce *m) rcd.hdr.revision =CPER_RECORD_REV ; rcd.hdr.signature_end =CPER_SIG_END ; rcd.hdr.section_count =1 ; - rcd.hdr.error_severity =CPER_SER_FATAL ; + rcd.hdr.error_severity =CPER_SEV_FATAL ;/* timestamp, platform_id, partition_id are all invalid */ rcd.hdr.validation_bits =0 ; rcd.hdr.record_length =sizeof (rcd);
@@ -96,7 +96,7 @@ int apei_write_mce(struct mce *m) rcd.sec_hdr.validation_bits =0 ; rcd.sec_hdr.flags =CPER_SEC_PRIMARY ; rcd.sec_hdr.section_type =CPER_SECTION_TYPE_MCE ; - rcd.sec_hdr.section_severity =CPER_SER_FATAL ; + rcd.sec_hdr.section_severity =CPER_SEV_FATAL ;memcpy (&rcd.mce, m,sizeof (*m));
drivers/acpi/apei/ghes.c +16 -16
@@ -132,26 +132,26 @@ static void ghes_fini(struct ghes *ghes) }enum { -GHES_SER_NO =0x0 , -GHES_SER_CORRECTED =0x1 , -GHES_SER_RECOVERABLE =0x2 , -GHES_SER_PANIC =0x3 , +GHES_SEV_NO =0x0 , +GHES_SEV_CORRECTED =0x1 , +GHES_SEV_RECOVERABLE =0x2 , +GHES_SEV_PANIC =0x3 , };static inline int ghes_severity (int severity) {switch (severity) { -case CPER_SER_INFORMATIONAL : -return GHES_SER_NO ; -case CPER_SER_CORRECTED : -return GHES_SER_CORRECTED ; -case CPER_SER_RECOVERABLE : -return GHES_SER_RECOVERABLE ; -case CPER_SER_FATAL : -return GHES_SER_PANIC ; +case CPER_SEV_INFORMATIONAL : +return GHES_SEV_NO ; +case CPER_SEV_CORRECTED : +return GHES_SEV_CORRECTED ; +case CPER_SEV_RECOVERABLE : +return GHES_SEV_RECOVERABLE ; +case CPER_SEV_FATAL : +return GHES_SEV_PANIC ;default :/* Unkown, go panic */ -return GHES_SER_PANIC ; +return GHES_SEV_PANIC ; } }
@@ -237,16 +237,16 @@ static void ghes_clear_estatus(struct ghstatic void ghes_do_proc (struct ghes *ghes) { -int ser, processed =0 ; +int sev, processed =0 ;struct acpi_hest_generic_data *gdata; - ser =ghes_severity (ghes->estatus->error_severity); + sev =ghes_severity (ghes->estatus->error_severity);apei_estatus_for_each_section (ghes->estatus, gdata) {#ifdef CONFIG_X86_MCE if (!uuid_le_cmp (*(uuid_le *)gdata->section_type,CPER_SEC_PLATFORM_MEM )) {apei_mce_report_mem_error ( - ser ==GHES_SER_CORRECTED , + sev ==GHES_SEV_CORRECTED , (struct cper_sec_mem_err *)(gdata+1 )); processed =1 ; }
include/linux/cper.h +4 -4
@@ -39,10 +39,10 @@* Severity difinition for error_severity in struct cper_record_header * and section_severity in struct cper_section_descriptor */ -#define CPER_SER_RECOVERABLE 0x0 -#define CPER_SER_FATAL 0x1 -#define CPER_SER_CORRECTED 0x2 -#define CPER_SER_INFORMATIONAL 0x3 +#define CPER_SEV_RECOVERABLE 0x0 +#define CPER_SEV_FATAL 0x1 +#define CPER_SEV_CORRECTED 0x2 +#define CPER_SEV_INFORMATIONAL 0x3/* * Validation bits difinition for validation_bits in struct