Merge tag 'trace-fixes-v4.1-rc2' of... (26b293e8) · Commits · 戴 / test

Merge tag 'trace-fixes-v4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace Pull tracing fix from Steven Rostedt: "The newly added ftrace_print_array_seq() function had a bug in it. Luckily, the only user of it didn't make the 4.1 merge window. But the helper function should be fixed before 4.2 when the users start coming in" * tag 'trace-fixes-v4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Make ftrace_print_array_seq compute buf_len

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;

+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, '{');