aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_hw_branches.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-02-07 19:38:43 -0500
committerSteven Rostedt <srostedt@redhat.com>2009-02-07 19:38:43 -0500
commit1830b52d0de8c60c4f5dfbac134aa8f69d815801 (patch)
tree2aa803853ac145fedd0d65324d77f64d25e7b3a2 /kernel/trace/trace_hw_branches.c
parent43769f10b4826376cbf4ce17af74a5b4e8dc4fcd (diff)
trace: remove deprecated entry->cpu
Impact: fix to prevent developers from using entry->cpu With the new ring buffer infrastructure, the cpu for the entry is implicit with which CPU buffer it is on. The original code use to record the current cpu into the generic entry header, which can be retrieved by entry->cpu. When the ring buffer was introduced, the users were convert to use the the cpu number of which cpu ring buffer was in use (this was passed to the tracers by the iterator: iter->cpu). Unfortunately, the cpu item in the entry structure was never removed. This allowed for developers to use it instead of the proper iter->cpu, unknowingly, using an uninitialized variable. This was not the fault of the developers, since it would seem like the logical place to retrieve the cpu identifier. This patch removes the cpu item from the entry structure and fixes all the users that should have been using iter->cpu. Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Diffstat (limited to 'kernel/trace/trace_hw_branches.c')
-rw-r--r--kernel/trace/trace_hw_branches.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c
index fff3545fc866..549238a9b133 100644
--- a/kernel/trace/trace_hw_branches.c
+++ b/kernel/trace/trace_hw_branches.c
@@ -159,7 +159,7 @@ static enum print_line_t bts_trace_print_line(struct trace_iterator *iter)
159 trace_assign_type(it, entry); 159 trace_assign_type(it, entry);
160 160
161 if (entry->type == TRACE_HW_BRANCHES) { 161 if (entry->type == TRACE_HW_BRANCHES) {
162 if (trace_seq_printf(seq, "%4d ", entry->cpu) && 162 if (trace_seq_printf(seq, "%4d ", iter->cpu) &&
163 seq_print_ip_sym(seq, it->to, symflags) && 163 seq_print_ip_sym(seq, it->to, symflags) &&
164 trace_seq_printf(seq, "\t <- ") && 164 trace_seq_printf(seq, "\t <- ") &&
165 seq_print_ip_sym(seq, it->from, symflags) && 165 seq_print_ip_sym(seq, it->from, symflags) &&
@@ -195,7 +195,6 @@ void trace_hw_branch(u64 from, u64 to)
195 entry = ring_buffer_event_data(event); 195 entry = ring_buffer_event_data(event);
196 tracing_generic_entry_update(&entry->ent, 0, from); 196 tracing_generic_entry_update(&entry->ent, 0, from);
197 entry->ent.type = TRACE_HW_BRANCHES; 197 entry->ent.type = TRACE_HW_BRANCHES;
198 entry->ent.cpu = cpu;
199 entry->from = from; 198 entry->from = from;
200 entry->to = to; 199 entry->to = to;
201 ring_buffer_unlock_commit(tr->buffer, event, irq2); 200 ring_buffer_unlock_commit(tr->buffer, event, irq2);