diff options
Diffstat (limited to 'drivers/acpi/apei')
-rw-r--r-- | drivers/acpi/apei/ghes.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index fd0cc016a099..c76aff6c861d 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c | |||
@@ -132,26 +132,26 @@ static void ghes_fini(struct ghes *ghes) | |||
132 | } | 132 | } |
133 | 133 | ||
134 | enum { | 134 | enum { |
135 | GHES_SER_NO = 0x0, | 135 | GHES_SEV_NO = 0x0, |
136 | GHES_SER_CORRECTED = 0x1, | 136 | GHES_SEV_CORRECTED = 0x1, |
137 | GHES_SER_RECOVERABLE = 0x2, | 137 | GHES_SEV_RECOVERABLE = 0x2, |
138 | GHES_SER_PANIC = 0x3, | 138 | GHES_SEV_PANIC = 0x3, |
139 | }; | 139 | }; |
140 | 140 | ||
141 | static inline int ghes_severity(int severity) | 141 | static inline int ghes_severity(int severity) |
142 | { | 142 | { |
143 | switch (severity) { | 143 | switch (severity) { |
144 | case CPER_SER_INFORMATIONAL: | 144 | case CPER_SEV_INFORMATIONAL: |
145 | return GHES_SER_NO; | 145 | return GHES_SEV_NO; |
146 | case CPER_SER_CORRECTED: | 146 | case CPER_SEV_CORRECTED: |
147 | return GHES_SER_CORRECTED; | 147 | return GHES_SEV_CORRECTED; |
148 | case CPER_SER_RECOVERABLE: | 148 | case CPER_SEV_RECOVERABLE: |
149 | return GHES_SER_RECOVERABLE; | 149 | return GHES_SEV_RECOVERABLE; |
150 | case CPER_SER_FATAL: | 150 | case CPER_SEV_FATAL: |
151 | return GHES_SER_PANIC; | 151 | return GHES_SEV_PANIC; |
152 | default: | 152 | default: |
153 | /* Unkown, go panic */ | 153 | /* Unkown, go panic */ |
154 | return GHES_SER_PANIC; | 154 | return GHES_SEV_PANIC; |
155 | } | 155 | } |
156 | } | 156 | } |
157 | 157 | ||
@@ -237,16 +237,16 @@ static void ghes_clear_estatus(struct ghes *ghes) | |||
237 | 237 | ||
238 | static void ghes_do_proc(struct ghes *ghes) | 238 | static void ghes_do_proc(struct ghes *ghes) |
239 | { | 239 | { |
240 | int ser, processed = 0; | 240 | int sev, processed = 0; |
241 | struct acpi_hest_generic_data *gdata; | 241 | struct acpi_hest_generic_data *gdata; |
242 | 242 | ||
243 | ser = ghes_severity(ghes->estatus->error_severity); | 243 | sev = ghes_severity(ghes->estatus->error_severity); |
244 | apei_estatus_for_each_section(ghes->estatus, gdata) { | 244 | apei_estatus_for_each_section(ghes->estatus, gdata) { |
245 | #ifdef CONFIG_X86_MCE | 245 | #ifdef CONFIG_X86_MCE |
246 | if (!uuid_le_cmp(*(uuid_le *)gdata->section_type, | 246 | if (!uuid_le_cmp(*(uuid_le *)gdata->section_type, |
247 | CPER_SEC_PLATFORM_MEM)) { | 247 | CPER_SEC_PLATFORM_MEM)) { |
248 | apei_mce_report_mem_error( | 248 | apei_mce_report_mem_error( |
249 | ser == GHES_SER_CORRECTED, | 249 | sev == GHES_SEV_CORRECTED, |
250 | (struct cper_sec_mem_err *)(gdata+1)); | 250 | (struct cper_sec_mem_err *)(gdata+1)); |
251 | processed = 1; | 251 | processed = 1; |
252 | } | 252 | } |