Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

Pull sb_edac patches from Mauro Carvalho Chehab:
 "A couple sb_edac driver improvements, cleaning a little bit the amount
  of data sent to dmesg, and fixing one error message"

* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
  sb_edac: mark MCE messages as KERN_DEBUG
  sb_edac: use "event" instead of "exception" when MC wasnt signaled

1 files changed, 16 insertions, 9 deletions

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 347c7a1c2725..c460ba5d65a8 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -1828,6 +1828,7 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,
         struct mce *mce = (struct mce *)data;
         struct mem_ctl_info *mci;
         struct sbridge_pvt *pvt;
+        char *type;
 
         if (get_edac_report_status() == EDAC_REPORTING_DISABLED)
                 return NOTIFY_DONE;
@@ -1846,17 +1847,23 @@ static int sbridge_mce_check_error(struct notifier_block *nb, unsigned long val,
         if ((mce->status & 0xefff) >> 7 != 1)
                 return NOTIFY_DONE;
 
-        printk("sbridge: HANDLING MCE MEMORY ERROR\n");
+        if (mce->mcgstatus & MCG_STATUS_MCIP)
+                type = "Exception";
+        else
+                type = "Event";
+
+        sbridge_mc_printk(mci, KERN_DEBUG, "HANDLING MCE MEMORY ERROR\n");
 
-        printk("CPU %d: Machine Check Exception: %Lx Bank %d: %016Lx\n",
-               mce->extcpu, mce->mcgstatus, mce->bank, mce->status);
-        printk("TSC %llx ", mce->tsc);
-        printk("ADDR %llx ", mce->addr);
-        printk("MISC %llx ", mce->misc);
+        sbridge_mc_printk(mci, KERN_DEBUG, "CPU %d: Machine Check %s: %Lx "
+                          "Bank %d: %016Lx\n", mce->extcpu, type,
+                          mce->mcgstatus, mce->bank, mce->status);
+        sbridge_mc_printk(mci, KERN_DEBUG, "TSC %llx ", mce->tsc);
+        sbridge_mc_printk(mci, KERN_DEBUG, "ADDR %llx ", mce->addr);
+        sbridge_mc_printk(mci, KERN_DEBUG, "MISC %llx ", mce->misc);
 
-        printk("PROCESSOR %u:%x TIME %llu SOCKET %u APIC %x\n",
-                mce->cpuvendor, mce->cpuid, mce->time,
-                mce->socketid, mce->apicid);
+        sbridge_mc_printk(mci, KERN_DEBUG, "PROCESSOR %u:%x TIME %llu SOCKET "
+                          "%u APIC %x\n", mce->cpuvendor, mce->cpuid,
+                          mce->time, mce->socketid, mce->apicid);
 
         /* Only handle if it is the right mc controller */
         if (cpu_data(mce->cpu).phys_proc_id != pvt->sbridge_dev->mc)