diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-21 17:53:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-21 17:53:46 +0200 |
| commit | f80836c86ebd44bf8f90882283a1618e09dfaed2 (patch) | |
| tree | be28455ff20df71fcebc3e59b2575721ab099ba3 /kernel/trace/trace_output.h | |
| parent | 598357eba6a55d27ddc7ead80ebb83fe1aad9b83 (diff) | |
| parent | ff5f149b6aec8edbfa3698721667acd043009a33 (diff) | |
Merge branch 'tip/tracing/core-7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/trace/trace_output.h')
| -rw-r--r-- | kernel/trace/trace_output.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_output.h b/kernel/trace/trace_output.h index 9d91c72ba38..c038eba0492 100644 --- a/kernel/trace/trace_output.h +++ b/kernel/trace/trace_output.h @@ -25,7 +25,7 @@ extern void trace_event_read_unlock(void); extern struct trace_event *ftrace_find_event(int type); extern enum print_line_t trace_nop_print(struct trace_iterator *iter, - int flags); + int flags, struct trace_event *event); extern int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry); |