From 5af20af5d76c320d76aa8897c86e7714c41c19b4 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 7 Oct 2009 21:53:41 -0400 Subject: [PATCH] --- yaml --- r: 167095 b: refs/heads/master c: 8f6e8a314ab37cadd72da5ace9027f2d04aba854 h: refs/heads/master i: 167093: 5f5365cccc82bc6e02fe57862e8dde7b6f885119 167091: b96d1f9c54b132d96152f4b6de92ad593fe8d880 167087: 78b948b4f76c895aeecc33090ef7425b6a548832 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_branch.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1102bd1e87fa..6bb89a07a89a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8647b28726b09b087155417bb698e7b3789f8a0 +refs/heads/master: 8f6e8a314ab37cadd72da5ace9027f2d04aba854 diff --git a/trunk/kernel/trace/trace_branch.c b/trunk/kernel/trace/trace_branch.c index 216e2dd302a0..4a194f08f88c 100644 --- a/trunk/kernel/trace/trace_branch.c +++ b/trunk/kernel/trace/trace_branch.c @@ -34,6 +34,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) struct trace_array *tr = branch_tracer; struct ring_buffer_event *event; struct trace_branch *entry; + struct ring_buffer *buffer; unsigned long flags; int cpu, pc; const char *p; @@ -54,7 +55,8 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) goto out; pc = preempt_count(); - event = trace_buffer_lock_reserve(tr->buffer, TRACE_BRANCH, + buffer = tr->buffer; + event = trace_buffer_lock_reserve(buffer, TRACE_BRANCH, sizeof(*entry), flags, pc); if (!event) goto out; @@ -74,8 +76,8 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) entry->line = f->line; entry->correct = val == expect; - if (!filter_check_discard(call, entry, tr->buffer, event)) - ring_buffer_unlock_commit(tr->buffer, event); + if (!filter_check_discard(call, entry, buffer, event)) + ring_buffer_unlock_commit(buffer, event); out: atomic_dec(&tr->data[cpu]->disabled);