diff --git a/include/linux/console.h b/include/linux/console.h
index 73bab0f58af5c9ddf455881de6bb00124c9948dd..c0e08d6ad6cac0dbd3945e5e9844671134aa37ae 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -167,6 +167,7 @@ static inline void console_sysfs_notify(void)
 { }
 #endif
 extern bool console_suspend_enabled;
+extern int is_console_suspended(void);
 
 /* Suspend and resume console messages over PM events */
 extern void suspend_console(void);
diff --git a/kernel/panic.c b/kernel/panic.c
index 449a10219cbe9735dd02164f241a643c475b6777..9b13790b57439b812b7bdf212d9638d42a110f39 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -8,6 +8,7 @@
  * This function is used through-out the kernel (including mm and fs)
  * to indicate a major problem.
  */
+#include <linux/console.h>
 #include <linux/debug_locks.h>
 #include <linux/interrupt.h>
 #include <linux/kmsg_dump.h>
@@ -132,6 +133,10 @@ void panic(const char *fmt, ...)
 	 */
 	smp_send_stop();
 
+	/* print last_kmsg even after console suspend */
+	if (is_console_suspended())
+		resume_console();
+
 	kmsg_dump(KMSG_DUMP_PANIC);
 
 	atomic_notifier_call_chain(&panic_notifier_list, 0, buf);
diff --git a/kernel/printk.c b/kernel/printk.c
index f4a94dd7b1db3fda4a1d043039b3a8da1bc005d0..76103c2a7cb596b7cd5e57c83a19bd8aa23352a5 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -2155,6 +2155,12 @@ module_param_named(console_suspend, console_suspend_enabled,
 MODULE_PARM_DESC(console_suspend, "suspend console during suspend"
 	" and hibernate operations");
 
+/* check current suspend/resume status of the console */
+int is_console_suspended(void)
+{
+	return console_suspended;
+}
+
 /**
  * suspend_console - suspend the console subsystem
  *