]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
EDAC, MCE, AMD: Correct formatting of decoded text
authorBorislav Petkov <bp@suse.de>
Sat, 22 Nov 2014 12:41:01 +0000 (13:41 +0100)
committerBorislav Petkov <bp@suse.de>
Tue, 25 Nov 2014 12:09:49 +0000 (13:09 +0100)
Write out MCx_ADDR into the more humanly readable "MCx Error Address"
and remove double colon in the output.

Cc: Aravind Gopalakrishnan <aravind.gopalakrishnan@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
drivers/edac/mce_amd.c

index 5d4efae864e4b6081c2578e8e129b3c210733ec3..58586d59bf8ed2ff2b7a7abf20288105da43f2d3 100644 (file)
@@ -441,8 +441,8 @@ static bool k8_mc2_mce(u16 ec, u8 xec)
                pr_cont(": %s error in the L2 cache tags.\n", R4_MSG(ec));
        else if (xec == 0x0) {
                if (TLB_ERROR(ec))
-                       pr_cont(": %s error in a Page Descriptor Cache or "
-                               "Guest TLB.\n", TT_MSG(ec));
+                       pr_cont("%s error in a Page Descriptor Cache or Guest TLB.\n",
+                               TT_MSG(ec));
                else if (BUS_ERROR(ec))
                        pr_cont(": %s/ECC error in data read from NB: %s.\n",
                                R4_MSG(ec), PP_MSG(ec));
@@ -781,7 +781,7 @@ int amd_decode_mce(struct notifier_block *nb, unsigned long val, void *data)
        pr_cont("]: 0x%016llx\n", m->status);
 
        if (m->status & MCI_STATUS_ADDRV)
-               pr_emerg(HW_ERR "MC%d_ADDR: 0x%016llx\n", m->bank, m->addr);
+               pr_emerg(HW_ERR "MC%d Error Address: 0x%016llx\n", m->bank, m->addr);
 
        if (!fam_ops)
                goto err_code;