diff options
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 7 | 
1 files changed, 6 insertions, 1 deletions
| diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 25fb1b0e53fa..1783aabc6128 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2412,8 +2412,13 @@ reflush:  	for_each_cwq_cpu(cpu, wq) {  		struct cpu_workqueue_struct *cwq = get_cwq(cpu, wq); +		bool drained; -		if (!cwq->nr_active && list_empty(&cwq->delayed_works)) +		spin_lock_irq(&cwq->gcwq->lock); +		drained = !cwq->nr_active && list_empty(&cwq->delayed_works); +		spin_unlock_irq(&cwq->gcwq->lock); + +		if (drained)  			continue;  		if (++flush_cnt == 10 || | 
