aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Kuznetsov <[email protected]>2015-11-20 15:57:24 -0800
committerLinus Torvalds <[email protected]>2015-11-20 16:17:32 -0800
commit7625b3a0007decf2b135cb47ca67abc78a7b1bc1 (patch)
tree4aa040716e9f30f2a45d08c57b2417a4c103bdcb
parent9d8a765211335cfdad464b90fb19f546af5706ae (diff)
kernel/panic.c: turn off locks debug before releasing console lock
Commit 08d78658f393 ("panic: release stale console lock to always get the logbuf printed out") introduced an unwanted bad unlock balance report when panic() is called directly and not from OOPS (e.g. from out_of_memory()). The difference is that in case of OOPS we disable locks debug in oops_enter() and on direct panic call nobody does that. Fixes: 08d78658f393 ("panic: release stale console lock to always get the logbuf printed out") Reported-by: kernel test robot <[email protected]> Signed-off-by: Vitaly Kuznetsov <[email protected]> Cc: HATAYAMA Daisuke <[email protected]> Cc: Masami Hiramatsu <[email protected]> Cc: Jiri Kosina <[email protected]> Cc: Baoquan He <[email protected]> Cc: Prarit Bhargava <[email protected]> Cc: Xie XiuQi <[email protected]> Cc: Seth Jennings <[email protected]> Cc: "K. Y. Srinivasan" <[email protected]> Cc: Jan Kara <[email protected]> Cc: Petr Mladek <[email protected]> Cc: Yasuaki Ishimatsu <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--kernel/panic.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 4579dbb7ed87..4b150bc0c6c1 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -152,8 +152,11 @@ void panic(const char *fmt, ...)
* We may have ended up stopping the CPU holding the lock (in
* smp_send_stop()) while still having some valuable data in the console
* buffer. Try to acquire the lock then release it regardless of the
- * result. The release will also print the buffers out.
+ * result. The release will also print the buffers out. Locks debug
+ * should be disabled to avoid reporting bad unlock balance when
+ * panic() is not being callled from OOPS.
*/
+ debug_locks_off();
console_trylock();
console_unlock();