---

yaml --- r: 304775 b: refs/heads/master c: 0976dfc h: refs/heads/master i: 304773: 582ac5e 304771: 01fd1a4 304767: ba50af8 v: v3
git-mirror · Apr 23, 2012 · 40c6172 · 40c6172
1 parent 995fcc2
commit 40c6172
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5b2552b4ebbeadcadde1532d7bbd3f850719046
+refs/heads/master: 0976dfc1d0cd80a4e9dfaf87bd8744612bde475a
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
@@ -2509,6 +2509,9 @@ bool flush_work(struct work_struct *work)
 {
 	struct wq_barrier barr;
 
+	lock_map_acquire(&work->lockdep_map);
+	lock_map_release(&work->lockdep_map);
+
 	if (start_flush_work(work, &barr, true)) {
 		wait_for_completion(&barr.done);
 		destroy_work_on_stack(&barr.work);