Merge tag 'powerpc-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

[linux.git] / arch / powerpc / platforms / powernv / opal.c

diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index c15182765ff59a4809ac5777a8bdeb4fae0b89e9..516e23de5a3d3fe0ecd28aba329e22c13db48eab 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -490,9 +490,12 @@ void pnv_platform_error_reboot(struct pt_regs *regs, const char *msg)
         *    opal to trigger checkstop explicitly for error analysis.
         *    The FSP PRD component would have already got notified
         *    about this error through other channels.
+        * 4. We are running on a newer skiboot that by default does
+        *    not cause a checkstop, drops us back to the kernel to
+        *    extract context and state at the time of the error.
         */
 
-       ppc_md.restart(NULL);
+       panic(msg);
 }
 
 int opal_machine_check(struct pt_regs *regs)