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 /lib/debugobjects.c | |
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 'lib/debugobjects.c')
-rw-r--r-- | lib/debugobjects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c index 056052dc8e91..04c1ef717fe0 100644 --- a/lib/debugobjects.c +++ b/lib/debugobjects.c | |||
@@ -199,7 +199,7 @@ static void free_object(struct debug_obj *obj) | |||
199 | * initialized: | 199 | * initialized: |
200 | */ | 200 | */ |
201 | if (obj_pool_free > ODEBUG_POOL_SIZE && obj_cache) | 201 | if (obj_pool_free > ODEBUG_POOL_SIZE && obj_cache) |
202 | sched = keventd_up(); | 202 | sched = 1; |
203 | hlist_add_head(&obj->node, &obj_pool); | 203 | hlist_add_head(&obj->node, &obj_pool); |
204 | obj_pool_free++; | 204 | obj_pool_free++; |
205 | obj_pool_used--; | 205 | obj_pool_used--; |