From 40c61721470db2945ab9417490189546be45b0fb Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Fri, 20 Apr 2012 17:28:50 -0700 Subject: [PATCH] --- yaml --- r: 304775 b: refs/heads/master c: 0976dfc1d0cd80a4e9dfaf87bd8744612bde475a h: refs/heads/master i: 304773: 582ac5e37c44b0a5096eeb9bc58edc4fbf260ebb 304771: 01fd1a4e1a0a03a6218da5d034bd928c667f0d55 304767: ba50af8d72ea9d36b1fd49d24b190d7267909dd7 v: v3 --- [refs] | 2 +- trunk/kernel/workqueue.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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);