diff options
author | Aaro Koskinen <aaro.koskinen@nokia.com> | 2009-10-02 14:41:20 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-05 21:08:09 +0200 |
commit | d014e8894dfc523dd9d2f2a17b6dcb94facea810 (patch) | |
tree | d4a3dec08acc9e9fb661576bd5f7b0ce11a1ecc9 /kernel/panic.c | |
parent | 135c8aea557cf53abe6c8847e286d01442124193 (diff) | |
download | op-kernel-dev-d014e8894dfc523dd9d2f2a17b6dcb94facea810.zip op-kernel-dev-d014e8894dfc523dd9d2f2a17b6dcb94facea810.tar.gz |
panic: Fix panic message visibility by calling bust_spinlocks(0) before dying
Commit ffd71da4e3f ("panic: decrease oops_in_progress only after
having done the panic") moved bust_spinlocks(0) to the end of the
function, which in practice is never reached.
As a result console_unblank() is not called, and on some systems
the user may not see the panic message.
Move it back up to before the unblanking.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <1254483680-25578-1-git-send-email-aaro.koskinen@nokia.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/panic.c')
-rw-r--r-- | kernel/panic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 512ab73..bc4dcb6 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -90,6 +90,8 @@ NORET_TYPE void panic(const char * fmt, ...) atomic_notifier_call_chain(&panic_notifier_list, 0, buf); + bust_spinlocks(0); + if (!panic_blink) panic_blink = no_blink; @@ -136,7 +138,6 @@ NORET_TYPE void panic(const char * fmt, ...) mdelay(1); i++; } - bust_spinlocks(0); } EXPORT_SYMBOL(panic); |