Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 766c02b6 authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Greg Kroah-Hartman
Browse files

tracing: Use __printf markup to silence compiler 

[ 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: default avatarMathieu Malaterre <malat@debian.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9823784

kernel/trace/trace.c

+5 −0
Original line number Diff line number Diff line
@@ -2137,6 +2137,7 @@ out: 
}

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)
@@ -2190,12 +2191,14 @@ __trace_array_vprintk(struct ring_buffer *buffer, 
	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, ...)

{
@@ -2211,6 +2214,7 @@ int trace_array_printk(struct trace_array *tr, 
	return ret;

}



__printf(3, 4)

int trace_array_printk_buf(struct ring_buffer *buffer,

			   unsigned long ip, const char *fmt, ...)

{
@@ -2226,6 +2230,7 @@ int trace_array_printk_buf(struct ring_buffer *buffer, 
	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);