arch/x86/kernel/cpu/mcheck/p4.c: cleanups

[sfrench/cifs-2.6.git] / arch / x86 / kernel / cpu / mcheck / p6.c

diff --git a/arch/x86/kernel/cpu/mcheck/p6.c b/arch/x86/kernel/cpu/mcheck/p6.c
index cb3829e07987df25cae0f1bb1a8705912abcc40c..b61f3038c4c80422a6c807f232cad2ad660a328e 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/p6.c
+++ b/arch/x86/kernel/cpu/mcheck/p6.c
@@ -33,21 +33,24 @@ static void intel_machine_check(struct pt_regs * regs, long error_code)
        for (i=0; i<nr_mce_banks; i++) {
                rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high);
                if (high & (1<<31)) {
+                       char misc[20];
+                       char addr[24];
+                       misc[0] = addr[0] = '\0';
                        if (high & (1<<29))
                                recover |= 1;
                        if (high & (1<<25))
                                recover |= 2;
-                       printk (KERN_EMERG "Bank %d: %08x%08x", i, high, low);
                        high &= ~(1<<31);
                        if (high & (1<<27)) {
                                rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh);
-                               printk ("[%08x%08x]", ahigh, alow);
+                               snprintf (misc, 20, "[%08x%08x]", ahigh, alow);
                        }
                        if (high & (1<<26)) {
                                rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
-                               printk (" at %08x%08x", ahigh, alow);
+                               snprintf (addr, 24, " at %08x%08x", ahigh, alow);
                        }
-                       printk ("\n");
+                       printk (KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
+                               smp_processor_id(), i, high, low, misc, addr);
                }
        }