diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/workqueue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 026f778e879b..cb2ccfbed0c6 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
@@ -997,6 +997,7 @@ static void __queue_work(unsigned int cpu, struct workqueue_struct *wq, | |||
997 | 997 | ||
998 | /* gcwq determined, get cwq and queue */ | 998 | /* gcwq determined, get cwq and queue */ |
999 | cwq = get_cwq(gcwq->cpu, wq); | 999 | cwq = get_cwq(gcwq->cpu, wq); |
1000 | trace_workqueue_queue_work(cpu, cwq, work); | ||
1000 | 1001 | ||
1001 | BUG_ON(!list_empty(&work->entry)); | 1002 | BUG_ON(!list_empty(&work->entry)); |
1002 | 1003 | ||
@@ -1004,6 +1005,7 @@ static void __queue_work(unsigned int cpu, struct workqueue_struct *wq, | |||
1004 | work_flags = work_color_to_flags(cwq->work_color); | 1005 | work_flags = work_color_to_flags(cwq->work_color); |
1005 | 1006 | ||
1006 | if (likely(cwq->nr_active < cwq->max_active)) { | 1007 | if (likely(cwq->nr_active < cwq->max_active)) { |
1008 | trace_workqueue_activate_work(work); | ||
1007 | cwq->nr_active++; | 1009 | cwq->nr_active++; |
1008 | worklist = gcwq_determine_ins_pos(gcwq, cwq); | 1010 | worklist = gcwq_determine_ins_pos(gcwq, cwq); |
1009 | } else { | 1011 | } else { |
@@ -1679,6 +1681,7 @@ static void cwq_activate_first_delayed(struct cpu_workqueue_struct *cwq) | |||
1679 | struct work_struct, entry); | 1681 | struct work_struct, entry); |
1680 | struct list_head *pos = gcwq_determine_ins_pos(cwq->gcwq, cwq); | 1682 | struct list_head *pos = gcwq_determine_ins_pos(cwq->gcwq, cwq); |
1681 | 1683 | ||
1684 | trace_workqueue_activate_work(work); | ||
1682 | move_linked_works(work, pos, NULL); | 1685 | move_linked_works(work, pos, NULL); |
1683 | __clear_bit(WORK_STRUCT_DELAYED_BIT, work_data_bits(work)); | 1686 | __clear_bit(WORK_STRUCT_DELAYED_BIT, work_data_bits(work)); |
1684 | cwq->nr_active++; | 1687 | cwq->nr_active++; |