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

Commit ac01ce14 authored by Alex Bennée's avatar Alex Bennée Committed by Steven Rostedt
Browse files

tracing: Make ftrace_print_array_seq compute buf_len 

The only caller to this function (__print_array) was getting it wrong by
passing the array length instead of buffer length. As the element size
was already being passed for other reasons it seems reasonable to push
the calculation of buffer length into the function.

Link: http://lkml.kernel.org/r/1430320727-14582-1-git-send-email-alex.bennee@linaro.org



Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 5ebe6afa

include/linux/ftrace_event.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ const char *ftrace_print_hex_seq(struct trace_seq *p, 
				 const unsigned char *buf, int len);



const char *ftrace_print_array_seq(struct trace_seq *p,

				   const void *buf, int buf_len,

				   const void *buf, int count,

				   size_t el_size);



struct trace_iterator;

kernel/trace/trace_output.c

+2 −1
Original line number Diff line number Diff line
@@ -178,12 +178,13 @@ ftrace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len) 
EXPORT_SYMBOL(ftrace_print_hex_seq);



const char *

ftrace_print_array_seq(struct trace_seq *p, const void *buf, int buf_len,

ftrace_print_array_seq(struct trace_seq *p, const void *buf, int count,

		       size_t el_size)

{

	const char *ret = trace_seq_buffer_ptr(p);

	const char *prefix = "";

	void *ptr = (void *)buf;

	size_t buf_len = count * el_size;



	trace_seq_putc(p, '{');