diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-31 07:30:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-31 07:30:17 +0200 |
| commit | 169310f71fc820fe153ec04c6a111e444a68d6d5 (patch) | |
| tree | a586d0f08548159ceb8527ff59f8414579f70c1f /include/linux/workqueue.h | |
| parent | b3c39758c8a6972f02b43f83dba7fe7a352371b9 (diff) | |
| parent | c2a9838452a4d71f76103c18c926468a9ea05713 (diff) | |
Merge branch 'linus' into locking/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); |