diff options
author | Tejun Heo <tj@kernel.org> | 2016-10-19 12:12:40 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-10-19 12:12:40 -0400 |
commit | 8bc4a04455969c36bf54a942ad9d28d80969ed51 (patch) | |
tree | 9fb87b458122c05f77b1fba28405761bedbcac1d /drivers/tty/vt | |
parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
parent | 2186d9f940b6a04f263a3bacd48f2a7ba96df4cf (diff) |
Merge branch 'for-4.9' into for-4.10
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r-- | drivers/tty/vt/vt.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 06fb39c1d6dd..95528461a021 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c | |||
@@ -3929,10 +3929,6 @@ void unblank_screen(void) | |||
3929 | */ | 3929 | */ |
3930 | static void blank_screen_t(unsigned long dummy) | 3930 | static void blank_screen_t(unsigned long dummy) |
3931 | { | 3931 | { |
3932 | if (unlikely(!keventd_up())) { | ||
3933 | mod_timer(&console_timer, jiffies + (blankinterval * HZ)); | ||
3934 | return; | ||
3935 | } | ||
3936 | blank_timer_expired = 1; | 3932 | blank_timer_expired = 1; |
3937 | schedule_work(&console_work); | 3933 | schedule_work(&console_work); |
3938 | } | 3934 | } |