* Borislav Petkov wrote: > Hi Linus, > > please pull the first (of two) AMD64 EDAC update sets. This one > adds MCE decoding functionality to the EDAC core and has been > simmering for a while now in linux-next. The next one will be > forthcoming in the next couple of days and will contain more general > cleanups/improvements/bugfixes. > > Thanks. > > The following changes since commit 74fca6a42863ffacaf7ba6f1936a9f228950f657: > Linus Torvalds (1): > Linux 2.6.31 > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-linus > > Borislav Petkov (15): > EDAC: move MCE error descriptions to EDAC core > EDAC: beef up ErrorCodeExt error signatures > amd64_edac: cleanup amd64_process_error_info > amd64_edac: cleanup/complete NB MCE decoding > amd64_edac: remove memory and GART TLB error decoders > amd64_edac: cleanup amd64_decode_bus_error > x86, mce: pass mce info to EDAC for decoding > EDAC, AMD: carve out MCi_STATUS decoding > EDAC, AMD: carve out decoding of MCi_STATUS ErrorCode > EDAC, AMD: decode data cache MCEs > EDAC, AMD: decode instruction cache MCEs > EDAC, AMD: decode bus unit MCEs > EDAC, AMD: decode load store MCEs > EDAC, AMD: decode FR MCEs > x86, mce: do not compile mcelog message on AMD > > arch/x86/kernel/cpu/mcheck/mce.c | 12 +- > drivers/edac/Makefile | 6 +- > drivers/edac/amd64_edac.c | 328 +++++++++------------------ > drivers/edac/amd64_edac.h | 71 +------ > drivers/edac/amd64_edac_dbg.c | 2 +- > drivers/edac/amd64_edac_err_types.c | 161 ------------- > drivers/edac/edac_mce_amd.c | 422 +++++++++++++++++++++++++++++++++++ > drivers/edac/edac_mce_amd.h | 69 ++++++ > 8 files changed, 619 insertions(+), 452 deletions(-) > delete mode 100644 drivers/edac/amd64_edac_err_types.c > create mode 100644 drivers/edac/edac_mce_amd.c > create mode 100644 drivers/edac/edac_mce_amd.h -tip testing found this build failure with the attached config: drivers/edac/edac_mce_amd.c: In function ‘decode_mce’: drivers/edac/edac_mce_amd.c:408: error: ‘per_cpu__cpu_llc_id’ undeclared (first use in this function) drivers/edac/edac_mce_amd.c:408: error: (Each undeclared identifier is reported only once drivers/edac/edac_mce_amd.c:408: error: for each function it appears in.) I did the patchlet below but this needs a cleaner fix eventually. A proper node abstraction needs to be factored out and provided as a facility regardless of config settings. Ingo Signed-off-by: Ingo Molnar --- drivers/edac/edac_mce_amd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: linux2/drivers/edac/edac_mce_amd.c =================================================================== --- linux2.orig/drivers/edac/edac_mce_amd.c +++ linux2/drivers/edac/edac_mce_amd.c @@ -405,8 +405,11 @@ void decode_mce(struct mce *m) regs.nbsh = (u32)(m->status >> 32); regs.nbeal = (u32) m->addr; regs.nbeah = (u32)(m->addr >> 32); +#ifdef CONFIG_X86_HT node = per_cpu(cpu_llc_id, m->extcpu); - +#else + node = 0; +#endif amd_decode_nb_mce(node, ®s, 1); break;