summaryrefslogtreecommitdiff
path: root/include/linux/workqueue.h
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2016-11-07 10:31:10 +0300
committerMax Filippov <jcmvbkbc@gmail.com>2016-11-07 10:31:10 +0300
commit712cba5d87a6c0e980ee5fad45734e189c4d7151 (patch)
treef73d73c08df83276d7775678b8f41b94a0c28fa7 /include/linux/workqueue.h
parenta4c6be5ad1d0c7af0c5421b68a00b6406b28a325 (diff)
parenta909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff)
downloadlinux-712cba5d87a6c0e980ee5fad45734e189c4d7151.tar.xz
Merge tag 'v4.9-rc3' into xtensa-for-next
Linux 4.9-rc3
Diffstat (limited to 'include/linux/workqueue.h')
-rw-r--r--include/linux/workqueue.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index ca73c503b92a..fc6e22186405 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -442,6 +442,7 @@ extern int schedule_on_each_cpu(work_func_t func);
int execute_in_process_context(work_func_t fn, struct execute_work *);
extern bool flush_work(struct work_struct *work);
+extern bool cancel_work(struct work_struct *work);
extern bool cancel_work_sync(struct work_struct *work);
extern bool flush_delayed_work(struct delayed_work *dwork);
@@ -625,4 +626,10 @@ void wq_watchdog_touch(int cpu);
static inline void wq_watchdog_touch(int cpu) { }
#endif /* CONFIG_WQ_WATCHDOG */
+#ifdef CONFIG_SMP
+int workqueue_prepare_cpu(unsigned int cpu);
+int workqueue_online_cpu(unsigned int cpu);
+int workqueue_offline_cpu(unsigned int cpu);
+#endif
+
#endif