diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-20 08:08:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-20 08:08:02 +0100 |
| commit | 10c18c44a6494167e7a7ca3a3a61a67972017bdf (patch) | |
| tree | 20c3afe744b0d88783161169ec88e45a53662fe7 /include/linux/workqueue.h | |
| parent | 9e49e2447c6385e45c6fddd70d6c0e917e21b669 (diff) | |
| parent | 1b5f3ba415fe4cf8b8b39c8d104ed44cde330658 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/workqueue.h')
| -rw-r--r-- | include/linux/workqueue.h | 1 |
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); |