git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
edac
/
amd64_edac_dbg.c
diff --git
a/drivers/edac/amd64_edac_dbg.c
b/drivers/edac/amd64_edac_dbg.c
index 0a41b248a4adcf83f76ac55ad19bc68aac66a47e..59cf2cf6e11ec3fc9628b5f6b32aa525ae3a80cf 100644
(file)
--- 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,
/* Process the Mapping request */
/* TODO: Add race prevention */
- amd
64_process_error_info(mci
, &pvt->ctl_error_info, 1);
+ amd
_decode_nb_mce(pvt->mc_node_id
, &pvt->ctl_error_info, 1);
return count;
}