diff options
Diffstat (limited to 'kernel/trace/trace_hw_branches.c')
-rw-r--r-- | kernel/trace/trace_hw_branches.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_hw_branches.c b/kernel/trace/trace_hw_branches.c index fff3545fc866..e720c001db2b 100644 --- a/kernel/trace/trace_hw_branches.c +++ b/kernel/trace/trace_hw_branches.c | |||
@@ -175,7 +175,7 @@ void trace_hw_branch(u64 from, u64 to) | |||
175 | struct trace_array *tr = hw_branch_trace; | 175 | struct trace_array *tr = hw_branch_trace; |
176 | struct ring_buffer_event *event; | 176 | struct ring_buffer_event *event; |
177 | struct hw_branch_entry *entry; | 177 | struct hw_branch_entry *entry; |
178 | unsigned long irq1, irq2; | 178 | unsigned long irq1; |
179 | int cpu; | 179 | int cpu; |
180 | 180 | ||
181 | if (unlikely(!tr)) | 181 | if (unlikely(!tr)) |
@@ -189,7 +189,7 @@ void trace_hw_branch(u64 from, u64 to) | |||
189 | if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) | 189 | if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) |
190 | goto out; | 190 | goto out; |
191 | 191 | ||
192 | event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry), &irq2); | 192 | event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry)); |
193 | if (!event) | 193 | if (!event) |
194 | goto out; | 194 | goto out; |
195 | entry = ring_buffer_event_data(event); | 195 | entry = ring_buffer_event_data(event); |
@@ -198,7 +198,7 @@ void trace_hw_branch(u64 from, u64 to) | |||
198 | entry->ent.cpu = cpu; | 198 | entry->ent.cpu = cpu; |
199 | entry->from = from; | 199 | entry->from = from; |
200 | entry->to = to; | 200 | entry->to = to; |
201 | ring_buffer_unlock_commit(tr->buffer, event, irq2); | 201 | ring_buffer_unlock_commit(tr->buffer, event); |
202 | 202 | ||
203 | out: | 203 | out: |
204 | atomic_dec(&tr->data[cpu]->disabled); | 204 | atomic_dec(&tr->data[cpu]->disabled); |