--- drivers/edac/edac_mce_amd.c

+++ drivers/edac/edac_mce_amd.c

@@ -295,7 +295,6 @@ wrong_ls_mce:

void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)

{

u32 ec = ERROR_CODE(regs->nbsl);

- u32 xec = EXT_ERROR_CODE(regs->nbsl);

if (!handle_errors)

return;

@@ -311,11 +310,15 @@ void amd_decode_nb_mce(int node_id, stru

if (regs->nbsh & K8_NBSH_ERR_CPU_VAL)

pr_cont(", core: %u\n", (u8)(regs->nbsh & 0xf));

} else {

- pr_cont(", core: %d\n", ilog2((regs->nbsh & 0xf)));

- }

+ u8 assoc_cpus = regs->nbsh & 0xf;

+

+ if (assoc_cpus > 0)

+ pr_cont(", core: %d", fls(assoc_cpus) - 1);

+ pr_cont("\n");

+ }

- pr_emerg("%s.\n", EXT_ERR_MSG(xec));

+ pr_emerg("%s.\n", EXT_ERR_MSG(regs->nbsl));

if (BUS_ERROR(ec) && nb_bus_decoder)

nb_bus_decoder(node_id, regs);

@@ -378,7 +381,7 @@ static void amd_decode_mce(struct mce *m

((m->status & MCI_STATUS_PCC) ? "yes" : "no"));

/* do the two bits[14:13] together */

- ecc = m->status & (3ULL << 45);

+ ecc = (m->status >> 45) & 0x3;

if (ecc)

pr_cont(", %sECC Error", ((ecc == 2) ? "C" : "U"));