diff options
| -rw-r--r-- | drivers/edac/amd64_edac_dbg.c | 2 | ||||
| -rw-r--r-- | drivers/edac/edac_mce_amd.c | 7 | ||||
| -rw-r--r-- | drivers/edac/edac_mce_amd.h | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/drivers/edac/amd64_edac_dbg.c b/drivers/edac/amd64_edac_dbg.c index 59cf2cf6e11e..22ef3fecf569 100644 --- a/drivers/edac/amd64_edac_dbg.c +++ b/drivers/edac/amd64_edac_dbg.c | |||
| @@ -24,7 +24,7 @@ static ssize_t amd64_nbea_store(struct mem_ctl_info *mci, const char *data, | |||
| 24 | 24 | ||
| 25 | /* Process the Mapping request */ | 25 | /* Process the Mapping request */ |
| 26 | /* TODO: Add race prevention */ | 26 | /* TODO: Add race prevention */ |
| 27 | amd_decode_nb_mce(pvt->mc_node_id, &pvt->ctl_error_info, 1); | 27 | amd_decode_nb_mce(pvt->mc_node_id, &pvt->ctl_error_info); |
| 28 | 28 | ||
| 29 | return count; | 29 | return count; |
| 30 | } | 30 | } |
diff --git a/drivers/edac/edac_mce_amd.c b/drivers/edac/edac_mce_amd.c index 564fe7c75345..765d7fbfa2d5 100644 --- a/drivers/edac/edac_mce_amd.c +++ b/drivers/edac/edac_mce_amd.c | |||
| @@ -291,13 +291,10 @@ wrong_ls_mce: | |||
| 291 | pr_emerg(HW_ERR "Corrupted LS MCE info?\n"); | 291 | pr_emerg(HW_ERR "Corrupted LS MCE info?\n"); |
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors) | 294 | void amd_decode_nb_mce(int node_id, struct err_regs *regs) |
| 295 | { | 295 | { |
| 296 | u32 ec = ERROR_CODE(regs->nbsl); | 296 | u32 ec = ERROR_CODE(regs->nbsl); |
| 297 | 297 | ||
| 298 | if (!handle_errors) | ||
| 299 | return; | ||
| 300 | |||
| 301 | /* | 298 | /* |
| 302 | * GART TLB error reporting is disabled by default. Bail out early. | 299 | * GART TLB error reporting is disabled by default. Bail out early. |
| 303 | */ | 300 | */ |
| @@ -402,7 +399,7 @@ static int amd_decode_mce(struct notifier_block *nb, unsigned long val, | |||
| 402 | regs.nbeah = (u32)(m->addr >> 32); | 399 | regs.nbeah = (u32)(m->addr >> 32); |
| 403 | node = amd_get_nb_id(m->extcpu); | 400 | node = amd_get_nb_id(m->extcpu); |
| 404 | 401 | ||
| 405 | amd_decode_nb_mce(node, ®s, 1); | 402 | amd_decode_nb_mce(node, ®s); |
| 406 | break; | 403 | break; |
| 407 | 404 | ||
| 408 | case 5: | 405 | case 5: |
diff --git a/drivers/edac/edac_mce_amd.h b/drivers/edac/edac_mce_amd.h index df23ee065f79..8920133075e9 100644 --- a/drivers/edac/edac_mce_amd.h +++ b/drivers/edac/edac_mce_amd.h | |||
| @@ -64,6 +64,6 @@ struct err_regs { | |||
| 64 | void amd_report_gart_errors(bool); | 64 | void amd_report_gart_errors(bool); |
| 65 | void amd_register_ecc_decoder(void (*f)(int, struct err_regs *)); | 65 | void amd_register_ecc_decoder(void (*f)(int, struct err_regs *)); |
| 66 | void amd_unregister_ecc_decoder(void (*f)(int, struct err_regs *)); | 66 | void amd_unregister_ecc_decoder(void (*f)(int, struct err_regs *)); |
| 67 | void amd_decode_nb_mce(int, struct err_regs *, int); | 67 | void amd_decode_nb_mce(int, struct err_regs *); |
| 68 | 68 | ||
| 69 | #endif /* _EDAC_MCE_AMD_H */ | 69 | #endif /* _EDAC_MCE_AMD_H */ |
