1 files changed, 5 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 1aec3025eeee..862b9dd4a9db 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -855,7 +855,8 @@ BEGIN_FTR_SECTION
         /* Supervisor state loss */
         li      r0,1
         stb     r0,PACA_NAPSTATELOST(r13)
-3:      MACHINE_CHECK_HANDLER_WINDUP
+3:      bl      .machine_check_queue_event
+        MACHINE_CHECK_HANDLER_WINDUP
         GET_PACA(r13)
         ld      r1,PACAR1(r13)
         b       .power7_enter_nap_mode
@@ -895,8 +896,10 @@ BEGIN_FTR_SECTION
 2:
         /*
          * Return from MC interrupt.
-         * TODO: Queue up the MCE event so that we can log it later.
+         * Queue up the MCE event so that we can log it later, while
+         * returning from kernel or opal call.
          */
+        bl      .machine_check_queue_event
         MACHINE_CHECK_HANDLER_WINDUP
         rfid
 9: