Prev: [072/116] usb: r8a66597-hcd: fix removed from an attached hub
Next: [058/116] NFSv4: Dont ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode()
From: Greg KH on 30 Mar 2010 20:10 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Borislav Petkov <borislav.petkov(a)amd.com> commit 5b89d2f9ace1970324facc68ca9b8fae19ce8096 upstream. Print the CPU associated with the error only when the field is valid. Signed-off-by: Borislav Petkov <borislav.petkov(a)amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- drivers/edac/edac_mce_amd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/edac/edac_mce_amd.c +++ b/drivers/edac/edac_mce_amd.c @@ -311,9 +311,13 @@ 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)); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |