diff --git a/[refs] b/[refs] index 5f4f8300f563..5d118457266b 100644 --- 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 index 66ec08de6dac..211eadb23323 100644 --- 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);