diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-13 15:59:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-13 15:59:57 -0500 |
commit | c11a6cfb0103d5d831e20bd9b75d10d13519fec5 (patch) | |
tree | f6706e6c68ad5c07922eb9a40e5bdb5f0a68581f /drivers/tty/vt | |
parent | e6efef7260ac2bb170059980a78440499f2cc0db (diff) | |
parent | 8bc4a04455969c36bf54a942ad9d28d80969ed51 (diff) |
Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue updates from Tejun Heo:
"Mostly patches to initialize workqueue subsystem earlier and get rid
of keventd_up().
The patches were headed for the last merge cycle but got delayed due
to a bug found late minute, which is fixed now.
Also, to help debugging, destroy_workqueue() is more chatty now on a
sanity check failure."
* 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: move wq_numa_init() to workqueue_init()
workqueue: remove keventd_up()
debugobj, workqueue: remove keventd_up() usage
slab, workqueue: remove keventd_up() usage
power, workqueue: remove keventd_up() usage
tty, workqueue: remove keventd_up() usage
mce, workqueue: remove keventd_up() usage
workqueue: make workqueue available early during boot
workqueue: dump workqueue state on sanity check failures in destroy_workqueue()
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 623264445100..4c10a9df3b91 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c | |||
@@ -3923,10 +3923,6 @@ void unblank_screen(void) | |||
3923 | */ | 3923 | */ |
3924 | static void blank_screen_t(unsigned long dummy) | 3924 | static void blank_screen_t(unsigned long dummy) |
3925 | { | 3925 | { |
3926 | if (unlikely(!keventd_up())) { | ||
3927 | mod_timer(&console_timer, jiffies + (blankinterval * HZ)); | ||
3928 | return; | ||
3929 | } | ||
3930 | blank_timer_expired = 1; | 3926 | blank_timer_expired = 1; |
3931 | schedule_work(&console_work); | 3927 | schedule_work(&console_work); |
3932 | } | 3928 | } |