1 files changed, 5 insertions, 1 deletions

diff --git a/kernel/panic.c b/kernel/panic.c
index 535c96510a44..8aa74497cc5a 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -160,8 +160,10 @@ void panic(const char *fmt, ...)
          *
          * Bypass the panic_cpu check and call __crash_kexec directly.
          */
-        if (!crash_kexec_post_notifiers)
+        if (!crash_kexec_post_notifiers) {
+                printk_nmi_flush_on_panic();
                 __crash_kexec(NULL);
+        }
 
         /*
          * Note smp_send_stop is the usual smp shutdown function, which
@@ -176,6 +178,8 @@ void panic(const char *fmt, ...)
          */
         atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
 
+        /* Call flush even twice. It tries harder with a single online CPU */
+        printk_nmi_flush_on_panic();
         kmsg_dump(KMSG_DUMP_PANIC);
 
         /*