diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-19 13:21:21 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-09-19 13:21:21 -0400 |
| commit | 0b6c404a07e3240b95aa5682fb8fd57c41609d7a (patch) | |
| tree | c4d410b0ec7044922b73c39ecfb3fbb620c29282 /include/trace/events/workqueue.h | |
| parent | 609455f481772c5a875b88e860a2ee0e2f25ebf0 (diff) | |
| parent | 55d512e245bc7699a8800e23df1a24195dd08217 (diff) | |
Merge tag 'v3.6-rc5' into for-linus
Sync with mainline so that I can revert an input patch that came in through
another subsystem tree.
Diffstat (limited to 'include/trace/events/workqueue.h')
| -rw-r--r-- | include/trace/events/workqueue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h index 4018f5058f27..f28d1b65f178 100644 --- a/include/trace/events/workqueue.h +++ b/include/trace/events/workqueue.h | |||
| @@ -54,7 +54,7 @@ TRACE_EVENT(workqueue_queue_work, | |||
| 54 | __entry->function = work->func; | 54 | __entry->function = work->func; |
| 55 | __entry->workqueue = cwq->wq; | 55 | __entry->workqueue = cwq->wq; |
| 56 | __entry->req_cpu = req_cpu; | 56 | __entry->req_cpu = req_cpu; |
| 57 | __entry->cpu = cwq->gcwq->cpu; | 57 | __entry->cpu = cwq->pool->gcwq->cpu; |
| 58 | ), | 58 | ), |
| 59 | 59 | ||
| 60 | TP_printk("work struct=%p function=%pf workqueue=%p req_cpu=%u cpu=%u", | 60 | TP_printk("work struct=%p function=%pf workqueue=%p req_cpu=%u cpu=%u", |