X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=kernel%2Fkthread.c;h=933a625621b8dbef0564919bf6f76aa30735372f;hb=3853f9123c185eb4018f5ccd3cdda5968efb5e10;hp=e29773c82b70c26fff598f864642f7dee010efab;hpb=1c84550f47f35851c5d37405b888ba964053fca1;p=linux-2.6-microblaze.git

diff --git a/kernel/kthread.c b/kernel/kthread.c
index e29773c82b70..933a625621b8 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -897,7 +897,8 @@ void kthread_delayed_work_timer_fn(struct timer_list *t)
 	/* Move the work from worker->delayed_work_list. */
 	WARN_ON_ONCE(list_empty(&work->node));
 	list_del_init(&work->node);
-	kthread_insert_work(worker, work, &worker->work_list);
+	if (!work->canceling)
+		kthread_insert_work(worker, work, &worker->work_list);
 
 	raw_spin_unlock_irqrestore(&worker->lock, flags);
 }