diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-04 09:04:08 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-06-05 16:55:52 +0300 |
| commit | 8dc0a56529f5d60bbb927049d48245b1a7989bf8 (patch) | |
| tree | bf1a12dcae17094441e2b4d9a550e212d0d82006 /kernel/trace | |
| parent | 516034787e06834816e9a0435499690704f01c47 (diff) | |
| parent | 0c534938663af8d2ca2a89bed07e8c0e624352a0 (diff) | |
Merge branch 'ti-dra7-dss' into 4.2/fbdev
Merge arch/ changes for TI's DRA7 SoC Display Subsystem.
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 692bf7184c8c..25a086bcb700 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -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, '{'); |