powerpc/64s: Better printing of machine check info for guest MCEs

[linux-2.6-block.git] / arch / powerpc / kernel / mce.c

diff --git a/arch/powerpc/kernel/mce.c b/arch/powerpc/kernel/mce.c
index bd933a75f0bcbe6dda0ede7abefe69038ada36e4..d501b48f287ece90a39f86be1370c222d74f1a8e 100644 (file)
--- a/arch/powerpc/kernel/mce.c
+++ b/arch/powerpc/kernel/mce.c
@@ -301,13 +301,13 @@ static void machine_check_process_queued_event(struct irq_work *work)
        while (__this_cpu_read(mce_queue_count) > 0) {
                index = __this_cpu_read(mce_queue_count) - 1;
                evt = this_cpu_ptr(&mce_event_queue[index]);
-               machine_check_print_event_info(evt, false);
+               machine_check_print_event_info(evt, false, false);
                __this_cpu_dec(mce_queue_count);
        }
 }
 
 void machine_check_print_event_info(struct machine_check_event *evt,
-                                   bool user_mode)
+                                   bool user_mode, bool in_guest)
 {
        const char *level, *sevstr, *subtype;
        static const char *mc_ue_types[] = {
@@ -387,7 +387,9 @@ void machine_check_print_event_info(struct machine_check_event *evt,
               evt->disposition == MCE_DISPOSITION_RECOVERED ?
               "Recovered" : "Not recovered");
 
-       if (user_mode) {
+       if (in_guest) {
+               printk("%s  Guest NIP: %016llx\n", level, evt->srr0);
+       } else if (user_mode) {
                printk("%s  NIP: [%016llx] PID: %d Comm: %s\n", level,
                        evt->srr0, current->pid, current->comm);
        } else {