From f6c9b839e4f7d71f9842eb001c62a976e37ace39 Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@novell.com>
Date: Fri, 17 Jun 2005 13:20:58 -0700
Subject: [PATCH] --- yaml --- r: 2180 b: refs/heads/master c:
 cc63b1e12b378c44e074571d5688c23be823b04c h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/char/vt.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 293b7e84e089..8853ca2f11d9 100644
--- 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
index e5ef1dfc5482..d7aa7a29f67e 100644
--- 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);
 }