diff --git a/include/linux/printk.h b/include/linux/printk.h
index fe7eb2351610d0181caa8c42d0bccaa12bd3f790..de1457e3af3f2b7d2b7f041d6c0aee718c1ecf42 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -209,6 +209,7 @@ void show_regs_print_info(const char *log_lvl);
 extern asmlinkage void dump_stack(void) __cold;
 extern void printk_safe_flush(void);
 extern void printk_safe_flush_on_panic(void);
+extern void zap_locks(void);
 #else
 static inline __printf(1, 0)
 int vprintk(const char *s, va_list args)
@@ -280,6 +281,10 @@ static inline void printk_safe_flush(void)
 static inline void printk_safe_flush_on_panic(void)
 {
 }
+
+static inline void zap_locks(void)
+{
+}
 #endif
 
 extern int kptr_restrict;
diff --git a/kernel/panic.c b/kernel/panic.c
index 332736a72a58e50666cc0bf14cb6ee542491ff2f..75f07bb57006d555285a9fa566ea0a39e566a996 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -265,6 +265,8 @@ void panic(const char *fmt, ...)
 		crash_smp_send_stop();
 	}
 
+	zap_locks();
+
 	/*
 	 * Run any panic handlers, including those that might need to
 	 * add information to the kmsg dump output.
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index d0df95346ab3f270d60cfd28aa15cf64783cfb13..a504ff599d69bcad2727422ca299cfbedc336b9c 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1742,6 +1742,23 @@ static DEFINE_RAW_SPINLOCK(console_owner_lock);
 static struct task_struct *console_owner;
 static bool console_waiter;
 
+void zap_locks(void)
+{
+	if (raw_spin_is_locked(&logbuf_lock)) {
+		debug_locks_off();
+		raw_spin_lock_init(&logbuf_lock);
+
+		console_suspended = 1;
+		sema_init(&console_sem, 1);
+	}
+
+	if (raw_spin_is_locked(&console_owner_lock)) {
+		raw_spin_lock_init(&console_owner_lock);
+		console_owner = NULL;
+		console_waiter = false;
+	}
+}
+
 /**
  * console_lock_spinning_enable - mark beginning of code where another
  *	thread might safely busy wait