---

yaml --- r: 2180 b: refs/heads/master c: cc63b1e h: refs/heads/master v: v3
git-mirror · Jun 18, 2005 · f6c9b83 · f6c9b83
1 parent 115f1d8
commit f6c9b83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43fde784a698aff26de0fc1dbd84aa075b8cfb5f
+refs/heads/master: cc63b1e12b378c44e074571d5688c23be823b04c
diff --git a/trunk/drivers/char/vt.c b/trunk/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);
 }