summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-03-20 01:13:04 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-03-20 01:13:04 +0300
commitc6256ca9c011db79cca6b7a3a659389ff217e0bd (patch)
tree68c08077361b67b4e2eed09b4f32c74e8926c242 /include
parent0d707a2f24c4a962313cffc980e2d74df460e45a (diff)
parent6417250d3f894e66a68ba1cd93676143f2376a6f (diff)
downloadlinux-c6256ca9c011db79cca6b7a3a659389ff217e0bd.tar.xz
Merge branch 'for-4.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue fixes from Tejun Heo: "Two low-impact workqueue commits. One fixes workqueue creation error path and the other removes the unused cancel_work()" * 'for-4.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: remove unused cancel_work() workqueue: use put_device() instead of kfree()
Diffstat (limited to 'include')
-rw-r--r--include/linux/workqueue.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index bc0cda180c8b..0c3301421c57 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -456,7 +456,6 @@ 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);