aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/kernel/trace/trace_output.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2023-07-02 18:53:03 -0700
committerAndrew Morton <akpm@linux-foundation.org>2023-07-02 18:53:03 -0700
commit3fbff91afbf0148e937b8718ed865b073c587d9f (patch)
treef69741c34579567af3d31f68737ea322d9311892 /kernel/trace/trace_output.c
parentMerge branch 'master' into mm-hotfixes-stable (diff)
parentMerge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff)
downloadwireguard-linux-3fbff91afbf0148e937b8718ed865b073c587d9f.tar.xz
wireguard-linux-3fbff91afbf0148e937b8718ed865b073c587d9f.zip
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'kernel/trace/trace_output.c')
-rw-r--r--kernel/trace/trace_output.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 1e33f367783e..db575094c498 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -1446,6 +1446,8 @@ static struct trace_event trace_osnoise_event = {
};
/* TRACE_TIMERLAT */
+
+static char *timerlat_lat_context[] = {"irq", "thread", "user-ret"};
static enum print_line_t
trace_timerlat_print(struct trace_iterator *iter, int flags,
struct trace_event *event)
@@ -1458,7 +1460,7 @@ trace_timerlat_print(struct trace_iterator *iter, int flags,
trace_seq_printf(s, "#%-5u context %6s timer_latency %9llu ns\n",
field->seqnum,
- field->context ? "thread" : "irq",
+ timerlat_lat_context[field->context],
field->timer_latency);
return trace_handle_return(s);