X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=kernel%2Fpanic.c;h=cff279a7f697b9ee26d0c70a93397403f45c1a21;hb=2cb9eb78a7cbef6b235faf981d6d2c0579d6eb79;hp=2cfef408fec931ac0ef3f3c95b31269ed1d3ea29;hpb=124dcf7960d6832ca72c1cad8a6d87fef756b34e;p=mirror_ubuntu-bionic-kernel.git

diff --git a/kernel/panic.c b/kernel/panic.c
index 2cfef408fec9..cff279a7f697 100644
--- 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>
@@ -147,6 +148,7 @@ void panic(const char *fmt, ...)
 	 * after setting panic_cpu) from invoking panic() again.
 	 */
 	local_irq_disable();
+	preempt_disable_notrace();
 
 	/*
 	 * It's possible to come here directly from a panic-assertion and
@@ -232,7 +234,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
@@ -640,7 +645,7 @@ device_initcall(register_warn_debugfs);
  */
 __visible void __stack_chk_fail(void)
 {
-	panic("stack-protector: Kernel stack is corrupted in: %p\n",
+	panic("stack-protector: Kernel stack is corrupted in: %pB\n",
 		__builtin_return_address(0));
 }
 EXPORT_SYMBOL(__stack_chk_fail);