Merge remote-tracking branch 'workqueues/for-next'

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index bd81f039027782b923b99be667caa12142c2bf5d..9debb7c4df648776e0346211cb4ad7644e8f7b47 100644 (file)
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4033,6 +4033,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
                for (i = 0; i < WORK_NR_COLORS; i++) {
                        if (WARN_ON(pwq->nr_in_flight[i])) {
                                mutex_unlock(&wq->mutex);
+                               show_workqueue_state();
                                return;
                        }
                }
@@ -4041,6 +4042,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
                    WARN_ON(pwq->nr_active) ||
                    WARN_ON(!list_empty(&pwq->delayed_works))) {
                        mutex_unlock(&wq->mutex);
+                       show_workqueue_state();
                        return;
                }
        }