Merge branch 'linus' into tracing/kmemtrace2

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / kernel / trace / trace_functions_graph.c

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 930c08e5b38e0d35ab93b79896b0150907d31e50..8516e4f09e1b4559c8b450183f70c0cb39614950 100644 (file)
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -592,6 +592,12 @@ print_graph_comment(struct print_entry *trace, struct trace_seq *s,
        if (ent->flags & TRACE_FLAG_CONT)
                trace_seq_print_cont(s, iter);
 
+       /* Strip ending newline */
+       if (s->buffer[s->len - 1] == '\n') {
+               s->buffer[s->len - 1] = '\0';
+               s->len--;
+       }
+
        ret = trace_seq_printf(s, " */\n");
        if (!ret)
                return TRACE_TYPE_PARTIAL_LINE;