diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 09:31:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 09:31:34 +0200 |
| commit | 9dbdd6c41c12fb42ee7188eafa7e1917b192af3a (patch) | |
| tree | 06a9eb894bc976c5c20e84ccd74fd82b9b71aed4 /kernel/panic.c | |
| parent | 7a693d3f0d10f978ebdf3082c41404ab97106567 (diff) | |
| parent | 161291396e76e0832c08f617eb9bd364d1648148 (diff) | |
Merge commit 'v2.6.32-rc4' into perf/core
Merge reason: we were on an -rc1 base, merge up to -rc4.
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 bcdef26e333..96b45d0b4ba 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); |
