diff options
| author | Thomas Gleixner | 2014-03-23 15:20:44 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2014-03-25 17:33:42 +0100 |
| commit | ea2e64f280d2a34a8ed9ae3d783cd770d14b70ec (patch) | |
| tree | 49bbf487a2b6683f73d9970ba97598ba1a9da30d /kernel/workqueue.c | |
| parent | clocksource: CMT, MTU2, TMU and STI should depend on GENERIC_CLOCKEVENTS (diff) | |
| download | kernel-qcow2-linux-ea2e64f280d2a34a8ed9ae3d783cd770d14b70ec.tar.gz kernel-qcow2-linux-ea2e64f280d2a34a8ed9ae3d783cd770d14b70ec.tar.xz kernel-qcow2-linux-ea2e64f280d2a34a8ed9ae3d783cd770d14b70ec.zip | |
workqueue: Provide destroy_delayed_work_on_stack()
If a delayed or deferrable work is on stack we need to tell debug
objects that we are destroying the timer and the work. Otherwise we
leak the tracking object.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Acked-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/20140323141939.911487677@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 82ef9f3b7473..5b690b5a9e74 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -516,6 +516,13 @@ void destroy_work_on_stack(struct work_struct *work) } EXPORT_SYMBOL_GPL(destroy_work_on_stack); +void destroy_delayed_work_on_stack(struct delayed_work *work) +{ + destroy_timer_on_stack(&work->timer); + debug_object_free(&work->work, &work_debug_descr); +} +EXPORT_SYMBOL_GPL(destroy_delayed_work_on_stack); + #else static inline void debug_work_activate(struct work_struct *work) { } static inline void debug_work_deactivate(struct work_struct *work) { } |