aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorViktor Rosendahl <viktor.rosendahl@nokia.com>2009-01-06 14:40:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 15:59:11 -0800
commitb61312d353da1871778711040464b10f5cd904df (patch)
treeaffc5f594a89a654a13dd2fe0f196c4f96764b86 /lib
parentf41ced8f108cc80f16509b907cd7ac93944459bc (diff)
downloadmrst-s0i3-test-b61312d353da1871778711040464b10f5cd904df.tar.gz
mrst-s0i3-test-b61312d353da1871778711040464b10f5cd904df.tar.xz
mrst-s0i3-test-b61312d353da1871778711040464b10f5cd904df.zip
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>
Diffstat (limited to 'lib')
-rw-r--r--lib/bust_spinlocks.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bust_spinlocks.c b/lib/bust_spinlocks.c
index 486da62b2b0..9681d54b95d 100644
--- a/lib/bust_spinlocks.c
+++ b/lib/bust_spinlocks.c
@@ -12,6 +12,7 @@
#include <linux/tty.h>
#include <linux/wait.h>
#include <linux/vt_kern.h>
+#include <linux/console.h>
void __attribute__((weak)) bust_spinlocks(int yes)
@@ -22,6 +23,7 @@ void __attribute__((weak)) bust_spinlocks(int yes)
#ifdef CONFIG_VT
unblank_screen();
#endif
+ console_unblank();
if (--oops_in_progress == 0)
wake_up_klogd();
}