2 files changed, 7 insertions, 6 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f054bd6a1c66..87cf25171fb8 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3365,8 +3365,8 @@ static void print_func_help_header(struct trace_buffer *buf, struct seq_file *m,
 
         print_event_info(buf, m);
 
-        seq_printf(m, "#           TASK-PID   CPU#   %s  TIMESTAMP  FUNCTION\n", tgid ? "TGID     " : "");
-        seq_printf(m, "#              | |       |    %s     |         |\n",      tgid ? "  |      " : "");
+        seq_printf(m, "#           TASK-PID   %s  CPU#   TIMESTAMP  FUNCTION\n", tgid ? "TGID     " : "");
+        seq_printf(m, "#              | |     %s    |       |         |\n",      tgid ? "  |      " : "");
 }
 
 static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file *m,
@@ -3386,9 +3386,9 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
                    tgid ? tgid_space : space);
         seq_printf(m, "#                          %s||| /     delay\n",
                    tgid ? tgid_space : space);
-        seq_printf(m, "#           TASK-PID   CPU#%s||||    TIMESTAMP  FUNCTION\n",
+        seq_printf(m, "#           TASK-PID %sCPU#  ||||    TIMESTAMP  FUNCTION\n",
                    tgid ? "   TGID   " : space);
-        seq_printf(m, "#              | |       | %s||||       |         |\n",
+        seq_printf(m, "#              | |   %s  |   ||||       |         |\n",
                    tgid ? "     |    " : space);
 }
 
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 90db994ac900..1c8e30fda46a 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -594,8 +594,7 @@ int trace_print_context(struct trace_iterator *iter)
 
         trace_find_cmdline(entry->pid, comm);
 
-        trace_seq_printf(s, "%16s-%-5d [%03d] ",
-                               comm, entry->pid, iter->cpu);
+        trace_seq_printf(s, "%16s-%-5d ", comm, entry->pid);
 
         if (tr->trace_flags & TRACE_ITER_RECORD_TGID) {
                 unsigned int tgid = trace_find_tgid(entry->pid);
@@ -606,6 +605,8 @@ int trace_print_context(struct trace_iterator *iter)
                         trace_seq_printf(s, "(%5d) ", tgid);
         }
 
+        trace_seq_printf(s, "[%03d] ", iter->cpu);
+
         if (tr->trace_flags & TRACE_ITER_IRQ_INFO)
                 trace_print_lat_fmt(s, entry);