summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-08 18:22:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-08 18:22:05 -0700
commit26b293e854406ea4276b566cef75426adc3a9688 (patch)
tree66e90d9a3eb4741edba3701c210fe29ba4b4acaf /include
parent3e0283a53f7d2f2dae7bc4aa7f3104cb5988018f (diff)
parentac01ce1410fc2c7b5f3af5e9c972e6a412eee54f (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/linux/ftrace_event.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 46e83c2156c6..f9ecf63d47f1 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -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;