| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: Mathieu Malaterre <malat@debian.org> |
| Date: Thu, 8 Mar 2018 21:58:43 +0100 |
| Subject: tracing: Use __printf markup to silence compiler |
| |
| From: Mathieu Malaterre <malat@debian.org> |
| |
| [ Upstream commit 26b68dd2f48fe7699a89f0cfbb9f4a650dc1c837 ] |
| |
| Silence warnings (triggered at W=1) by adding relevant __printf attributes. |
| |
| CC kernel/trace/trace.o |
| kernel/trace/trace.c: In function ‘__trace_array_vprintk’: |
| kernel/trace/trace.c:2979:2: warning: function might be possible candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] |
| len = vscnprintf(tbuffer, TRACE_BUF_SIZE, fmt, args); |
| ^~~ |
| AR kernel/trace/built-in.o |
| |
| Link: http://lkml.kernel.org/r/20180308205843.27447-1-malat@debian.org |
| |
| Signed-off-by: Mathieu Malaterre <malat@debian.org> |
| Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| kernel/trace/trace.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/kernel/trace/trace.c |
| +++ b/kernel/trace/trace.c |
| @@ -2525,6 +2525,7 @@ out_nobuffer: |
| } |
| EXPORT_SYMBOL_GPL(trace_vbprintk); |
| |
| +__printf(3, 0) |
| static int |
| __trace_array_vprintk(struct ring_buffer *buffer, |
| unsigned long ip, const char *fmt, va_list args) |
| @@ -2579,12 +2580,14 @@ out_nobuffer: |
| return len; |
| } |
| |
| +__printf(3, 0) |
| int trace_array_vprintk(struct trace_array *tr, |
| unsigned long ip, const char *fmt, va_list args) |
| { |
| return __trace_array_vprintk(tr->trace_buffer.buffer, ip, fmt, args); |
| } |
| |
| +__printf(3, 0) |
| int trace_array_printk(struct trace_array *tr, |
| unsigned long ip, const char *fmt, ...) |
| { |
| @@ -2600,6 +2603,7 @@ int trace_array_printk(struct trace_arra |
| return ret; |
| } |
| |
| +__printf(3, 4) |
| int trace_array_printk_buf(struct ring_buffer *buffer, |
| unsigned long ip, const char *fmt, ...) |
| { |
| @@ -2615,6 +2619,7 @@ int trace_array_printk_buf(struct ring_b |
| return ret; |
| } |
| |
| +__printf(2, 0) |
| int trace_vprintk(unsigned long ip, const char *fmt, va_list args) |
| { |
| return trace_array_vprintk(&global_trace, ip, fmt, args); |