diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-23 04:06:54 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-23 04:06:54 +0300 |
| commit | ac9e806c9c018a6cc6e82d50275a4ac185343b4f (patch) | |
| tree | 89a9ebb6f03ba4093f62947a2bb339785e5f783b /include/trace/events | |
| parent | 4b3bd22b123b7a75e2d08e4eb45d406b0fa685cd (diff) | |
| parent | e9ad2eb3d9ae05471c9b9fafcc0a31d8f565ca5b (diff) | |
| download | linux-ac9e806c9c018a6cc6e82d50275a4ac185343b4f.tar.xz | |
Merge branch 'for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull qorkqueue updates from Tejun Heo:
"Tracepoint and comment updates only"
* 'for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: Use %s instead of function name
workqueue: tracing the name of the workqueue instead of it's address
workqueue: fix annotation for WQ_SYSFS
Diffstat (limited to 'include/trace/events')
| -rw-r--r-- | include/trace/events/workqueue.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h index 9b8ae961acc5..970cc2ea2850 100644 --- a/include/trace/events/workqueue.h +++ b/include/trace/events/workqueue.h @@ -30,7 +30,7 @@ TRACE_EVENT(workqueue_queue_work, TP_STRUCT__entry( __field( void *, work ) __field( void *, function) - __field( void *, workqueue) + __field( const char *, workqueue) __field( unsigned int, req_cpu ) __field( unsigned int, cpu ) ), @@ -38,12 +38,12 @@ TRACE_EVENT(workqueue_queue_work, TP_fast_assign( __entry->work = work; __entry->function = work->func; - __entry->workqueue = pwq->wq; + __entry->workqueue = pwq->wq->name; __entry->req_cpu = req_cpu; __entry->cpu = pwq->pool->cpu; ), - TP_printk("work struct=%p function=%ps workqueue=%p req_cpu=%u cpu=%u", + TP_printk("work struct=%p function=%ps workqueue=%s req_cpu=%u cpu=%u", __entry->work, __entry->function, __entry->workqueue, __entry->req_cpu, __entry->cpu) ); |