aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/workqueue.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/workqueue.c')
-rw-r--r--kernel/workqueue.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 3bebf73be976..ad9656886daa 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -486,13 +486,13 @@ void cancel_work_sync(struct work_struct *work)
486EXPORT_SYMBOL_GPL(cancel_work_sync); 486EXPORT_SYMBOL_GPL(cancel_work_sync);
487 487
488/** 488/**
489 * cancel_rearming_delayed_work - reliably kill off a delayed work. 489 * cancel_delayed_work_sync - reliably kill off a delayed work.
490 * @dwork: the delayed work struct 490 * @dwork: the delayed work struct
491 * 491 *
492 * It is possible to use this function if @dwork rearms itself via queue_work() 492 * It is possible to use this function if @dwork rearms itself via queue_work()
493 * or queue_delayed_work(). See also the comment for cancel_work_sync(). 493 * or queue_delayed_work(). See also the comment for cancel_work_sync().
494 */ 494 */
495void cancel_rearming_delayed_work(struct delayed_work *dwork) 495void cancel_delayed_work_sync(struct delayed_work *dwork)
496{ 496{
497 while (!del_timer(&dwork->timer) && 497 while (!del_timer(&dwork->timer) &&
498 !try_to_grab_pending(&dwork->work)) 498 !try_to_grab_pending(&dwork->work))
@@ -500,7 +500,7 @@ void cancel_rearming_delayed_work(struct delayed_work *dwork)
500 wait_on_work(&dwork->work); 500 wait_on_work(&dwork->work);
501 work_clear_pending(&dwork->work); 501 work_clear_pending(&dwork->work);
502} 502}
503EXPORT_SYMBOL(cancel_rearming_delayed_work); 503EXPORT_SYMBOL(cancel_delayed_work_sync);
504 504
505static struct workqueue_struct *keventd_wq __read_mostly; 505static struct workqueue_struct *keventd_wq __read_mostly;
506 506