projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iomap-5.8-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
[linux-2.6-microblaze.git]
/
drivers
/
edac
/
sb_edac.c
diff --git
a/drivers/edac/sb_edac.c
b/drivers/edac/sb_edac.c
index
7d51c82
..
d414698
100644
(file)
--- a/
drivers/edac/sb_edac.c
+++ b/
drivers/edac/sb_edac.c
@@
-3134,7
+3134,7
@@
static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,
struct mem_ctl_info *mci;
char *type;
struct mem_ctl_info *mci;
char *type;
- if (
edac_get_report_status() == EDAC_REPORTING_DISABLED
)
+ if (
mce->kflags & MCE_HANDLED_CEC
)
return NOTIFY_DONE;
/*
return NOTIFY_DONE;
/*
@@
-3183,7
+3183,8
@@
static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,
sbridge_mce_output_error(mci, mce);
/* Advice mcelog that the error were handled */
sbridge_mce_output_error(mci, mce);
/* Advice mcelog that the error were handled */
- return NOTIFY_STOP;
+ mce->kflags |= MCE_HANDLED_EDAC;
+ return NOTIFY_OK;
}
static struct notifier_block sbridge_mce_dec = {
}
static struct notifier_block sbridge_mce_dec = {
@@
-3523,8
+3524,6
@@
static int __init sbridge_init(void)
if (rc >= 0) {
mce_register_decode_chain(&sbridge_mce_dec);
if (rc >= 0) {
mce_register_decode_chain(&sbridge_mce_dec);
- if (edac_get_report_status() == EDAC_REPORTING_DISABLED)
- sbridge_printk(KERN_WARNING, "Loading driver, error reporting disabled.\n");
return 0;
}
return 0;
}