summaryrefslogtreecommitdiff
path: root/include/linux/trace_seq.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2023-01-09 20:28:19 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2023-01-09 20:28:19 -0800
commit407da561244b9d51e6a794d6305ba38ec2c9d907 (patch)
treea9b8e399f85eb14f9591fc654ae2372281ffa729 /include/linux/trace_seq.h
parent144ff5e03d745a299a9aabe2a597da843cf1c430 (diff)
parentb7bfaa761d760e72a969d116517eaa12e404c262 (diff)
Merge tag 'v6.2-rc3' into next
Merge with mainline to bring in timer_shutdown_sync() API.
Diffstat (limited to 'include/linux/trace_seq.h')
-rw-r--r--include/linux/trace_seq.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h
index 5a2c650d9e1c..0c4c7587d6c3 100644
--- a/include/linux/trace_seq.h
+++ b/include/linux/trace_seq.h
@@ -97,7 +97,8 @@ extern int trace_seq_hex_dump(struct trace_seq *s, const char *prefix_str,
const void *buf, size_t len, bool ascii);
#else /* CONFIG_TRACING */
-static inline void trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
+static inline __printf(2, 3)
+void trace_seq_printf(struct trace_seq *s, const char *fmt, ...)
{
}
static inline void