mei: exclude device from suspend direct complete optimization

[karo-tx-linux.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 08aa88dde7de806d4cb2b14fd93e87be8dd94501..a58932b41700a93c3a9fff8121ec716c4a256cac 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -9,6 +9,7 @@
  * to indicate a major problem.
  */
 #include <linux/debug_locks.h>
+#include <linux/sched/debug.h>
 #include <linux/interrupt.h>
 #include <linux/kmsg_dump.h>
 #include <linux/kallsyms.h>
@@ -188,7 +189,7 @@ void panic(const char *fmt, ...)
         * Bypass the panic_cpu check and call __crash_kexec directly.
         */
        if (!_crash_kexec_post_notifiers) {
-               printk_nmi_flush_on_panic();
+               printk_safe_flush_on_panic();
                __crash_kexec(NULL);
 
                /*
@@ -213,7 +214,7 @@ 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();
+       printk_safe_flush_on_panic();
        kmsg_dump(KMSG_DUMP_PANIC);
 
        /*
@@ -273,7 +274,8 @@ void panic(const char *fmt, ...)
                extern int stop_a_enabled;
                /* Make sure the user can actually press Stop-A (L1-A) */
                stop_a_enabled = 1;
-               pr_emerg("Press Stop-A (L1-A) to return to the boot prom\n");
+               pr_emerg("Press Stop-A (L1-A) from sun keyboard or send break\n"
+                        "twice on console to return to the boot prom\n");
        }
 #endif
 #if defined(CONFIG_S390)