diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-11 15:11:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-11 15:11:34 +1100 |
| commit | 57873cd9151be185cb0d7920278a8c40b7616e41 (patch) | |
| tree | 3e55abb198cbce402820d996cde71f9ed120114f /drivers | |
| parent | 8deb3dab1b5cb9fd7d4494d56a666de1398bf1cf (diff) | |
| parent | ee969eaa612754418d0497cc91ce2658c3c33755 (diff) | |
Merge remote branch 'edac-amd/for-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/edac_mce_amd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/edac/edac_mce_amd.c b/drivers/edac/edac_mce_amd.c index 8fc91a019620..23395c294c2f 100644 --- a/drivers/edac/edac_mce_amd.c +++ b/drivers/edac/edac_mce_amd.c @@ -316,7 +316,12 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors) if (regs->nbsh & K8_NBSH_ERR_CPU_VAL) pr_cont(", core: %u\n", (u8)(regs->nbsh & 0xf)); } else { - pr_cont(", core: %d\n", fls((regs->nbsh & 0xf) - 1)); + u8 m = regs->nbsh & 0xf; + + if (m > 0) + pr_cont(", core: %d", fls(m) - 1); + + pr_cont("\n"); } pr_emerg("%s.\n", EXT_ERR_MSG(xec)); |