aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_mmiotrace.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace_mmiotrace.c')
-rw-r--r--kernel/trace/trace_mmiotrace.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
index ec78e244242e..104ddebc11d1 100644
--- a/kernel/trace/trace_mmiotrace.c
+++ b/kernel/trace/trace_mmiotrace.c
@@ -307,10 +307,8 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
307{ 307{
308 struct ring_buffer_event *event; 308 struct ring_buffer_event *event;
309 struct trace_mmiotrace_rw *entry; 309 struct trace_mmiotrace_rw *entry;
310 unsigned long irq_flags;
311 310
312 event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry), 311 event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
313 &irq_flags);
314 if (!event) { 312 if (!event) {
315 atomic_inc(&dropped_count); 313 atomic_inc(&dropped_count);
316 return; 314 return;
@@ -319,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
319 tracing_generic_entry_update(&entry->ent, 0, preempt_count()); 317 tracing_generic_entry_update(&entry->ent, 0, preempt_count());
320 entry->ent.type = TRACE_MMIO_RW; 318 entry->ent.type = TRACE_MMIO_RW;
321 entry->rw = *rw; 319 entry->rw = *rw;
322 ring_buffer_unlock_commit(tr->buffer, event, irq_flags); 320 ring_buffer_unlock_commit(tr->buffer, event);
323 321
324 trace_wake_up(); 322 trace_wake_up();
325} 323}
@@ -337,10 +335,8 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
337{ 335{
338 struct ring_buffer_event *event; 336 struct ring_buffer_event *event;
339 struct trace_mmiotrace_map *entry; 337 struct trace_mmiotrace_map *entry;
340 unsigned long irq_flags;
341 338
342 event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry), 339 event = ring_buffer_lock_reserve(tr->buffer, sizeof(*entry));
343 &irq_flags);
344 if (!event) { 340 if (!event) {
345 atomic_inc(&dropped_count); 341 atomic_inc(&dropped_count);
346 return; 342 return;
@@ -349,7 +345,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
349 tracing_generic_entry_update(&entry->ent, 0, preempt_count()); 345 tracing_generic_entry_update(&entry->ent, 0, preempt_count());
350 entry->ent.type = TRACE_MMIO_MAP; 346 entry->ent.type = TRACE_MMIO_MAP;
351 entry->map = *map; 347 entry->map = *map;
352 ring_buffer_unlock_commit(tr->buffer, event, irq_flags); 348 ring_buffer_unlock_commit(tr->buffer, event);
353 349
354 trace_wake_up(); 350 trace_wake_up();
355} 351}