diff options
| author | Jan Beulich <JBeulich@novell.com> | 2005-06-17 22:20:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-18 22:33:01 +0200 |
| commit | cc63b1e12b378c44e074571d5688c23be823b04c (patch) | |
| tree | f8feb187a8e8e12c822bb9fc18804f76341b1c45 /drivers/char/vt.c | |
| parent | Merge 'upstream-2.6.13' branch of rsync://rsync.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-cc63b1e12b378c44e074571d5688c23be823b04c.tar.xz linux-cc63b1e12b378c44e074571d5688c23be823b04c.zip | |
[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>
Diffstat (limited to 'drivers/char/vt.c')
| -rw-r--r-- | drivers/char/vt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index e5ef1dfc5482..d7aa7a29f67e 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); } |