1 files changed, 11 insertions, 4 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index adbf28183560..ed4583128b9c 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1758,6 +1758,7 @@ static int trace__printf_interrupted_entry(struct trace *trace)
 {
         struct thread_trace *ttrace;
         size_t printed;
+        int len;
 
         if (trace->failure_only || trace->current == NULL)
                 return 0;
@@ -1768,9 +1769,14 @@ static int trace__printf_interrupted_entry(struct trace *trace)
                 return 0;
 
         printed  = trace__fprintf_entry_head(trace, trace->current, 0, false, ttrace->entry_time, trace->output);
-        printed += fprintf(trace->output, ")%-*s ...\n", trace->args_alignment, ttrace->entry_str);
-        ttrace->entry_pending = false;
+        printed += len = fprintf(trace->output, "%s)", ttrace->entry_str);
+
+        if (len < trace->args_alignment - 4)
+                printed += fprintf(trace->output, "%-*s", trace->args_alignment - 4 - len, " ");
 
+        printed += fprintf(trace->output, " ...\n");
+
+        ttrace->entry_pending = false;
         ++trace->nr_events_printed;
 
         return printed;
@@ -2026,9 +2032,10 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,
         if (ttrace->entry_pending) {
                 printed = fprintf(trace->output, "%s", ttrace->entry_str);
         } else {
-                fprintf(trace->output, " ... [");
+                printed += fprintf(trace->output, " ... [");
                 color_fprintf(trace->output, PERF_COLOR_YELLOW, "continued");
-                fprintf(trace->output, "]: %s()", sc->name);
+                printed += 9;
+                printed += fprintf(trace->output, "]: %s()", sc->name);
         }
 
         printed++; /* the closing ')' */