diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-08 18:22:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-08 18:22:05 -0700 |
| commit | 26b293e854406ea4276b566cef75426adc3a9688 (patch) | |
| tree | 66e90d9a3eb4741edba3701c210fe29ba4b4acaf /include | |
| parent | Merge tag 'pm+acpi-4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | tracing: Make ftrace_print_array_seq compute buf_len (diff) | |
| download | linux-dev-26b293e854406ea4276b566cef75426adc3a9688.tar.xz linux-dev-26b293e854406ea4276b566cef75426adc3a9688.zip | |
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.h | 2 |
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; |