git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[pandora-kernel.git]
/
drivers
/
edac
/
amd64_edac.c
diff --git
a/drivers/edac/amd64_edac.c
b/drivers/edac/amd64_edac.c
index
09fcc52
..
8521401
100644
(file)
--- a/
drivers/edac/amd64_edac.c
+++ b/
drivers/edac/amd64_edac.c
@@
-2073,11
+2073,18
@@
static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci,
amd64_handle_ue(mci, info);
}
amd64_handle_ue(mci, info);
}
-void amd64_decode_bus_error(int node_id, struct
err_regs *regs
)
+void amd64_decode_bus_error(int node_id, struct
mce *m, u32 nbcfg
)
{
struct mem_ctl_info *mci = mci_lookup[node_id];
{
struct mem_ctl_info *mci = mci_lookup[node_id];
+ struct err_regs regs;
- __amd64_decode_bus_error(mci, regs);
+ regs.nbsl = (u32) m->status;
+ regs.nbsh = (u32)(m->status >> 32);
+ regs.nbeal = (u32) m->addr;
+ regs.nbeah = (u32)(m->addr >> 32);
+ regs.nbcfg = nbcfg;
+
+ __amd64_decode_bus_error(mci, ®s);
/*
* Check the UE bit of the NB status high register, if set generate some
/*
* Check the UE bit of the NB status high register, if set generate some
@@
-2086,7
+2093,7
@@
void amd64_decode_bus_error(int node_id, struct err_regs *regs)
*
* FIXME: this should go somewhere else, if at all.
*/
*
* FIXME: this should go somewhere else, if at all.
*/
- if (regs
->
nbsh & K8_NBSH_UC_ERR && !report_gart_errors)
+ if (regs
.
nbsh & K8_NBSH_UC_ERR && !report_gart_errors)
edac_mc_handle_ue_no_info(mci, "UE bit is set");
}
edac_mc_handle_ue_no_info(mci, "UE bit is set");
}