Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

[linux.git] / kernel / trace / trace_output.c

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index cab4a5398f1d4a746470f6ec4a88bc2da13860f7..d54ce252b05a848edb5d05ff3f32132975634b2c 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -219,10 +219,10 @@ trace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len,
 {
        int i;
        const char *ret = trace_seq_buffer_ptr(p);
+       const char *fmt = concatenate ? "%*phN" : "%*ph";
 
-       for (i = 0; i < buf_len; i++)
-               trace_seq_printf(p, "%s%2.2x", concatenate || i == 0 ? "" : " ",
-                                buf[i]);
+       for (i = 0; i < buf_len; i += 16)
+               trace_seq_printf(p, fmt, min(buf_len - i, 16), &buf[i]);
        trace_seq_putc(p, 0);
 
        return ret;