diff options
Diffstat (limited to 'kernel/trace/trace_branch.c')
-rw-r--r-- | kernel/trace/trace_branch.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index 770e52acfc1..48b2196abe3 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c | |||
@@ -52,14 +52,13 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) | |||
52 | if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) | 52 | if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) |
53 | goto out; | 53 | goto out; |
54 | 54 | ||
55 | event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry)); | 55 | pc = preempt_count(); |
56 | event = trace_buffer_lock_reserve(tr, TRACE_BRANCH, | ||
57 | sizeof(*entry), flags, pc); | ||
56 | if (!event) | 58 | if (!event) |
57 | goto out; | 59 | goto out; |
58 | 60 | ||
59 | pc = preempt_count(); | ||
60 | entry = ring_buffer_event_data(event); | 61 | entry = ring_buffer_event_data(event); |
61 | tracing_generic_entry_update(&entry->ent, flags, pc); | ||
62 | entry->ent.type = TRACE_BRANCH; | ||
63 | 62 | ||
64 | /* Strip off the path, only save the file */ | 63 | /* Strip off the path, only save the file */ |
65 | p = f->file + strlen(f->file); | 64 | p = f->file + strlen(f->file); |