Merge tag 'printk-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...

[uclinux-h8/linux.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index f6d549a..d10c340 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -14,6 +14,7 @@
 #include <linux/kmsg_dump.h>
 #include <linux/kallsyms.h>
 #include <linux/notifier.h>
+#include <linux/vt_kern.h>
 #include <linux/module.h>
 #include <linux/random.h>
 #include <linux/ftrace.h>
@@ -237,7 +238,10 @@ void panic(const char *fmt, ...)
        if (_crash_kexec_post_notifiers)
                __crash_kexec(NULL);
 
-       bust_spinlocks(0);
+#ifdef CONFIG_VT
+       unblank_screen();
+#endif
+       console_unblank();
 
        /*
         * We may have ended up stopping the CPU holding the lock (in