diff options
author | Viktor Rosendahl <viktor.rosendahl@nokia.com> | 2009-01-06 17:40:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:11 -0500 |
commit | b61312d353da1871778711040464b10f5cd904df (patch) | |
tree | affc5f594a89a654a13dd2fe0f196c4f96764b86 | |
parent | f41ced8f108cc80f16509b907cd7ac93944459bc (diff) |
oops handling: ensure that any oops is flushed to the mtdoops console
This used to work unpatched with older kernels, during the development
phase of mtdoops. Before commit e3e8a75d2acfc61ebf25524666a0a2c6abb0620c
a space was printed with console_loglevel set to 15, which probably
flushed the oops message as a side effect.
This is another patch from the Nokia N810 kernel.
Signed-off-by: Viktor Rosendahl <viktor.rosendahl@nokia.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | lib/bust_spinlocks.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bust_spinlocks.c b/lib/bust_spinlocks.c index 486da62b2b07..9681d54b95d1 100644 --- a/lib/bust_spinlocks.c +++ b/lib/bust_spinlocks.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/tty.h> | 12 | #include <linux/tty.h> |
13 | #include <linux/wait.h> | 13 | #include <linux/wait.h> |
14 | #include <linux/vt_kern.h> | 14 | #include <linux/vt_kern.h> |
15 | #include <linux/console.h> | ||
15 | 16 | ||
16 | 17 | ||
17 | void __attribute__((weak)) bust_spinlocks(int yes) | 18 | void __attribute__((weak)) bust_spinlocks(int yes) |
@@ -22,6 +23,7 @@ void __attribute__((weak)) bust_spinlocks(int yes) | |||
22 | #ifdef CONFIG_VT | 23 | #ifdef CONFIG_VT |
23 | unblank_screen(); | 24 | unblank_screen(); |
24 | #endif | 25 | #endif |
26 | console_unblank(); | ||
25 | if (--oops_in_progress == 0) | 27 | if (--oops_in_progress == 0) |
26 | wake_up_klogd(); | 28 | wake_up_klogd(); |
27 | } | 29 | } |