Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-2
+1
-1
include/linux/ftrace_event.h
+1
-1
include/linux/ftrace_event.h
+2
-1
kernel/trace/trace_output.c
+2
-1
kernel/trace/trace_output.c
···
178
178
EXPORT_SYMBOL(ftrace_print_hex_seq);
179
179
180
180
const char *
181
-
ftrace_print_array_seq(struct trace_seq *p, const void *buf, int buf_len,
181
+
ftrace_print_array_seq(struct trace_seq *p, const void *buf, int count,
182
182
size_t el_size)
183
183
{
184
184
const char *ret = trace_seq_buffer_ptr(p);
185
185
const char *prefix = "";
186
186
void *ptr = (void *)buf;
187
+
size_t buf_len = count * el_size;
187
188
188
189
trace_seq_putc(p, '{');
189
190