1 files changed, 11 insertions, 0 deletions

diff --git a/lib/bug.c b/lib/bug.c
index cff145f032a5..6cde380f09de 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -175,6 +175,17 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
                         pr_warn("WARNING: at %p [verbose debug info unavailable]\n",
                                 (void *)bugaddr);
 
+                if (panic_on_warn) {
+                        /*
+                         * This thread may hit another WARN() in the panic path.
+                         * Resetting this prevents additional WARN() from
+                         * panicking the system on this thread.  Other threads
+                         * are blocked by the panic_mutex in panic().
+                         */
+                        panic_on_warn = 0;
+                        panic("panic_on_warn set ...\n");
+                }
+
                 print_modules();
                 show_regs(regs);
                 print_oops_end_marker();