aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index ca070de36227..4d30414fe19a 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -415,12 +415,13 @@ void init_tracer_sysprof_debugfs(struct dentry *d_tracer);
415 415
416struct ring_buffer_event; 416struct ring_buffer_event;
417 417
418struct ring_buffer_event *trace_buffer_lock_reserve(struct trace_array *tr, 418struct ring_buffer_event *
419 int type, 419trace_buffer_lock_reserve(struct ring_buffer *buffer,
420 unsigned long len, 420 int type,
421 unsigned long flags, 421 unsigned long len,
422 int pc); 422 unsigned long flags,
423void trace_buffer_unlock_commit(struct trace_array *tr, 423 int pc);
424void trace_buffer_unlock_commit(struct ring_buffer *buffer,
424 struct ring_buffer_event *event, 425 struct ring_buffer_event *event,
425 unsigned long flags, int pc); 426 unsigned long flags, int pc);
426 427
@@ -481,10 +482,10 @@ void update_max_tr_single(struct trace_array *tr,
481#endif /* CONFIG_TRACER_MAX_TRACE */ 482#endif /* CONFIG_TRACER_MAX_TRACE */
482 483
483#ifdef CONFIG_STACKTRACE 484#ifdef CONFIG_STACKTRACE
484void ftrace_trace_stack(struct trace_array *tr, unsigned long flags, 485void ftrace_trace_stack(struct ring_buffer *buffer, unsigned long flags,
485 int skip, int pc); 486 int skip, int pc);
486 487
487void ftrace_trace_userstack(struct trace_array *tr, unsigned long flags, 488void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags,
488 int pc); 489 int pc);
489 490
490void __trace_stack(struct trace_array *tr, unsigned long flags, int skip, 491void __trace_stack(struct trace_array *tr, unsigned long flags, int skip,