Commit 26b293e8 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'trace-fixes-v4.1-rc2' of...

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
parents 3e0283a5 ac01ce14
...@@ -46,7 +46,7 @@ const char *ftrace_print_hex_seq(struct trace_seq *p, ...@@ -46,7 +46,7 @@ const char *ftrace_print_hex_seq(struct trace_seq *p,
const unsigned char *buf, int len); const unsigned char *buf, int len);
const char *ftrace_print_array_seq(struct trace_seq *p, 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); size_t el_size);
struct trace_iterator; struct trace_iterator;
......
...@@ -178,12 +178,13 @@ ftrace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len) ...@@ -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); EXPORT_SYMBOL(ftrace_print_hex_seq);
const char * 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) size_t el_size)
{ {
const char *ret = trace_seq_buffer_ptr(p); const char *ret = trace_seq_buffer_ptr(p);
const char *prefix = ""; const char *prefix = "";
void *ptr = (void *)buf; void *ptr = (void *)buf;
size_t buf_len = count * el_size;
trace_seq_putc(p, '{'); trace_seq_putc(p, '{');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment