From: Jan Beulich <JBeulich@novell.com>
Date: Fri, 17 Jun 2005 20:20:58 +0000 (-0700)
Subject: [PATCH] console blanking oops fix
X-Git-Tag: v2.6.14-rc2~49^2~36^2~49
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=cc63b1e12b378c44e074571d5688c23be823b04c;p=safe%2Fjmp%2Flinux-2.6

[PATCH] console blanking oops fix

When significant delays happen during boot (e.g.  with a kernel debugger,
but the problem has also seen in other cases) the timeout for blanking the
console may trigger, but the work scheduler may not have been initialized,
yet.  schedule_work() will oops over the null keventd_wq.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index e5ef1df..d7aa7a2 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2867,6 +2867,10 @@ void unblank_screen(void)
  */
 static void blank_screen_t(unsigned long dummy)
 {
+	if (unlikely(!keventd_up())) {
+		mod_timer(&console_timer, jiffies + blankinterval);
+		return;
+	}
 	blank_timer_expired = 1;
 	schedule_work(&console_work);
 }