summaryrefslogtreecommitdiff
path: root/include/linux/workqueue.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2016-10-19 12:12:40 -0400
committerTejun Heo <tj@kernel.org>2016-10-19 12:12:40 -0400
commit8bc4a04455969c36bf54a942ad9d28d80969ed51 (patch)
tree9fb87b458122c05f77b1fba28405761bedbcac1d /include/linux/workqueue.h
parent1001354ca34179f3db924eb66672442a173147dc (diff)
parent2186d9f940b6a04f263a3bacd48f2a7ba96df4cf (diff)
Merge branch 'for-4.9' into for-4.10
Diffstat (limited to 'include/linux/workqueue.h')
-rw-r--r--include/linux/workqueue.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index fc6e22186405..2cddd38794b2 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -590,14 +590,6 @@ static inline bool schedule_delayed_work(struct delayed_work *dwork,
return queue_delayed_work(system_wq, dwork, delay);
}
-/**
- * keventd_up - is workqueue initialized yet?
- */
-static inline bool keventd_up(void)
-{
- return system_wq != NULL;
-}
-
#ifndef CONFIG_SMP
static inline long work_on_cpu(int cpu, long (*fn)(void *), void *arg)
{
@@ -632,4 +624,7 @@ int workqueue_online_cpu(unsigned int cpu);
int workqueue_offline_cpu(unsigned int cpu);
#endif
+int __init workqueue_init_early(void);
+int __init workqueue_init(void);
+
#endif