Merge with /home/shaggy/git/linus-clean/

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);
 }