diff options
-rw-r--r-- | kernel/trace/trace_hw_branches.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c index 372b47ac3154..fff3545fc866 100644 --- a/kernel/trace/trace_hw_branches.c +++ b/kernel/trace/trace_hw_branches.c | |||
@@ -146,10 +146,7 @@ static void bts_trace_reset(struct trace_array *tr) | |||
146 | 146 | ||
147 | static void bts_trace_print_header(struct seq_file *m) | 147 | static void bts_trace_print_header(struct seq_file *m) |
148 | { | 148 | { |
149 | seq_puts(m, | 149 | seq_puts(m, "# CPU# TO <- FROM\n"); |
150 | "# CPU# FROM TO FUNCTION\n"); | ||
151 | seq_puts(m, | ||
152 | "# | | | |\n"); | ||
153 | } | 150 | } |
154 | 151 | ||
155 | static enum print_line_t bts_trace_print_line(struct trace_iterator *iter) | 152 | static enum print_line_t bts_trace_print_line(struct trace_iterator *iter) |
@@ -157,15 +154,15 @@ static enum print_line_t bts_trace_print_line(struct trace_iterator *iter) | |||
157 | struct trace_entry *entry = iter->ent; | 154 | struct trace_entry *entry = iter->ent; |
158 | struct trace_seq *seq = &iter->seq; | 155 | struct trace_seq *seq = &iter->seq; |
159 | struct hw_branch_entry *it; | 156 | struct hw_branch_entry *it; |
157 | unsigned long symflags = TRACE_ITER_SYM_OFFSET; | ||
160 | 158 | ||
161 | trace_assign_type(it, entry); | 159 | trace_assign_type(it, entry); |
162 | 160 | ||
163 | if (entry->type == TRACE_HW_BRANCHES) { | 161 | if (entry->type == TRACE_HW_BRANCHES) { |
164 | if (trace_seq_printf(seq, "%4d ", entry->cpu) && | 162 | if (trace_seq_printf(seq, "%4d ", entry->cpu) && |
165 | trace_seq_printf(seq, "0x%016llx -> 0x%016llx ", | 163 | seq_print_ip_sym(seq, it->to, symflags) && |
166 | it->from, it->to) && | 164 | trace_seq_printf(seq, "\t <- ") && |
167 | (!it->from || | 165 | seq_print_ip_sym(seq, it->from, symflags) && |
168 | seq_print_ip_sym(seq, it->from, /* sym_flags = */ 0)) && | ||
169 | trace_seq_printf(seq, "\n")) | 166 | trace_seq_printf(seq, "\n")) |
170 | return TRACE_TYPE_HANDLED; | 167 | return TRACE_TYPE_HANDLED; |
171 | return TRACE_TYPE_PARTIAL_LINE;; | 168 | return TRACE_TYPE_PARTIAL_LINE;; |