diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-12 11:16:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-12 11:16:00 -0700 |
| commit | b0cb8db39636f7d79caadf98a90e9367b4d9aabc (patch) | |
| tree | 8605ed8fec5936ce27d593fadb11cc35380de5ab /include/trace/events/workqueue.h | |
| parent | e3b8e2de19e18e4297c0dd747d56ecdc4ff96928 (diff) | |
| parent | 8bee9dd953b69c634d1c9a3241a8b357469ad4aa (diff) | |
| download | lwn-b0cb8db39636f7d79caadf98a90e9367b4d9aabc.tar.gz lwn-b0cb8db39636f7d79caadf98a90e9367b4d9aabc.zip | |
Merge tag 'wq-for-5.19-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue fixes from Tejun Heo:
"Tetsuo's patch to trigger build warnings if system-wide wq's are
flushed along with a TP type update and trivial comment update"
* tag 'wq-for-5.19-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: Switch to new kerneldoc syntax for named variable macro argument
workqueue: Fix type of cpu in trace event
workqueue: Wrap flush_workqueue() using a macro
Diffstat (limited to 'include/trace/events/workqueue.h')
| -rw-r--r-- | include/trace/events/workqueue.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h index 6154a2e72bce..262d52021c23 100644 --- a/include/trace/events/workqueue.h +++ b/include/trace/events/workqueue.h @@ -22,7 +22,7 @@ struct pool_workqueue; */ TRACE_EVENT(workqueue_queue_work, - TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq, + TP_PROTO(int req_cpu, struct pool_workqueue *pwq, struct work_struct *work), TP_ARGS(req_cpu, pwq, work), @@ -31,8 +31,8 @@ TRACE_EVENT(workqueue_queue_work, __field( void *, work ) __field( void *, function) __string( workqueue, pwq->wq->name) - __field( unsigned int, req_cpu ) - __field( unsigned int, cpu ) + __field( int, req_cpu ) + __field( int, cpu ) ), TP_fast_assign( @@ -43,7 +43,7 @@ TRACE_EVENT(workqueue_queue_work, __entry->cpu = pwq->pool->cpu; ), - TP_printk("work struct=%p function=%ps workqueue=%s req_cpu=%u cpu=%u", + TP_printk("work struct=%p function=%ps workqueue=%s req_cpu=%d cpu=%d", __entry->work, __entry->function, __get_str(workqueue), __entry->req_cpu, __entry->cpu) ); |