Merge remote-tracking branch 'arm64/for-next/core'

[karo-tx-linux.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index b333380c6bb239f1ee870430774613aaab4dfb2d..d96469de72dc555434818411625ff8a3f855f748 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -180,8 +180,7 @@ void panic(const char *fmt, ...)
         * panic() is not being callled from OOPS.
         */
        debug_locks_off();
-       console_trylock();
-       console_unlock();
+       console_flush_on_panic();
 
        if (!panic_blink)
                panic_blink = no_blink;