---

yaml --- r: 304774 b: refs/heads/master c: f5b2552 h: refs/heads/master v: v3
git-mirror · Apr 16, 2012 · 995fcc2 · 995fcc2
1 parent 582ac5e
commit 995fcc2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3283fb45c06dfd7b1a36da8e6ff39d313f0600c
+refs/heads/master: f5b2552b4ebbeadcadde1532d7bbd3f850719046
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
@@ -1032,7 +1032,10 @@ static void __queue_work(unsigned int cpu, struct workqueue_struct *wq,
 	cwq = get_cwq(gcwq->cpu, wq);
 	trace_workqueue_queue_work(cpu, cwq, work);
 
-	BUG_ON(!list_empty(&work->entry));
+	if (WARN_ON(!list_empty(&work->entry))) {
+		spin_unlock_irqrestore(&gcwq->lock, flags);
+		return;
+	}
 
 	cwq->nr_in_flight[cwq->work_color]++;
 	work_flags = work_color_to_flags(cwq->work_color);