From cc63b1e12b378c44e074571d5688c23be823b04c Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 17 Jun 2005 13:20:58 -0700 Subject: [PATCH] [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/vt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/char/vt.c b/drivers/char/vt.c index e5ef1dfc54..d7aa7a29f6 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); } -- 2.39.5