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_branch.c | |
| parent | 598357eba6a55d27ddc7ead80ebb83fe1aad9b83 (diff) | |
| parent | ff5f149b6aec8edbfa3698721667acd043009a33 (diff) | |
| download | op-kernel-dev-f80836c86ebd44bf8f90882283a1618e09dfaed2.zip op-kernel-dev-f80836c86ebd44bf8f90882283a1618e09dfaed2.tar.gz | |
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_branch.c')
| -rw-r--r-- | kernel/trace/trace_branch.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index b9bc4d4..8d3538b 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -143,7 +143,7 @@ static void branch_trace_reset(struct trace_array *tr) } static enum print_line_t trace_branch_print(struct trace_iterator *iter, - int flags) + int flags, struct trace_event *event) { struct trace_branch *field; @@ -167,9 +167,13 @@ static void branch_print_header(struct seq_file *s) " |\n"); } +static struct trace_event_functions trace_branch_funcs = { + .trace = trace_branch_print, +}; + static struct trace_event trace_branch_event = { .type = TRACE_BRANCH, - .trace = trace_branch_print, + .funcs = &trace_branch_funcs, }; static struct tracer branch_trace __read_mostly = |
