diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 10:35:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 10:35:12 +0100 |
| commit | 44b0635481437140b0e29d6023f05e805d5e7620 (patch) | |
| tree | ff31986115075410d0479df307a6b9841976026c /kernel/trace/trace_hw_branches.c | |
| parent | 4ad476e11f94fd3724c6e272d8220e99cd222b27 (diff) | |
| parent | 57794a9d48b63e34acbe63282628c9f029603308 (diff) | |
| download | linux-44b0635481437140b0e29d6023f05e805d5e7620.tar.bz2 | |
Merge branch 'tip/tracing/core/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Conflicts:
kernel/trace/trace_hw_branches.c
Diffstat (limited to 'kernel/trace/trace_hw_branches.c')
| -rw-r--r-- | kernel/trace/trace_hw_branches.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c index ca4bbcfb9e2c..e3e7db61c067 100644 --- a/kernel/trace/trace_hw_branches.c +++ b/kernel/trace/trace_hw_branches.c @@ -158,7 +158,7 @@ static enum print_line_t bts_trace_print_line(struct trace_iterator *iter) trace_assign_type(it, entry); if (entry->type == TRACE_HW_BRANCHES) { - if (trace_seq_printf(seq, "%4d ", entry->cpu) && + if (trace_seq_printf(seq, "%4d ", iter->cpu) && seq_print_ip_sym(seq, it->to, symflags) && trace_seq_printf(seq, "\t <- ") && seq_print_ip_sym(seq, it->from, symflags) && @@ -193,7 +193,8 @@ void trace_hw_branch(u64 from, u64 to) if (!event) goto out; entry = ring_buffer_event_data(event); - entry->ent.cpu = cpu; + tracing_generic_entry_update(&entry->ent, 0, from); + entry->ent.type = TRACE_HW_BRANCHES; entry->from = from; entry->to = to; trace_buffer_unlock_commit(tr, event, 0, 0); |