diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux/linux-debug.c
index 2ecdba5cff861ead75b9f9f014c01740df35830a..b8a49820eff7fe3845a5398c5ffa2a885bbcd067 100644
--- a/libcfs/libcfs/linux/linux-debug.c
+++ b/libcfs/libcfs/linux/linux-debug.c
@@ -192,7 +192,8 @@ void lbug_with_loc(const char *file, const char *func, const int line)
         }
 
         libcfs_debug_dumpstack(NULL);
-        libcfs_debug_dumplog();
+        if (!libcfs_panic_on_lbug)
+                libcfs_debug_dumplog();
         libcfs_run_lbug_upcall(file, func, line);
         if (libcfs_panic_on_lbug)
                 panic("LBUG");