diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-28 10:15:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-28 10:15:58 +0100 |
| commit | acdb2c287916ce247c09d460266370af45da55c5 (patch) | |
| tree | e09d6f8fa8f2b28d363374d027f9b4af1d3888cb /kernel/trace/trace.c | |
| parent | e9abf4c59d75cd71f118764376d037a677f573d0 (diff) | |
| parent | f2034f1e1adaac6713a6d48b5a2d4f3aa3e63ccb (diff) | |
| download | blackbird-op-linux-acdb2c287916ce247c09d460266370af45da55c5.tar.gz blackbird-op-linux-acdb2c287916ce247c09d460266370af45da55c5.zip | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 9c5987aca74b..c5e39cd7310d 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -846,6 +846,20 @@ void trace_buffer_unlock_commit(struct trace_array *tr, trace_wake_up(); } +struct ring_buffer_event * +trace_current_buffer_lock_reserve(unsigned char type, unsigned long len, + unsigned long flags, int pc) +{ + return trace_buffer_lock_reserve(&global_trace, + type, len, flags, pc); +} + +void trace_current_buffer_unlock_commit(struct ring_buffer_event *event, + unsigned long flags, int pc) +{ + return trace_buffer_unlock_commit(&global_trace, event, flags, pc); +} + void trace_function(struct trace_array *tr, unsigned long ip, unsigned long parent_ip, unsigned long flags, |
