[PATCH 4/4] tracing: Update branch trace to new event API

[Steven Rostedt <rostedt@goodmis.org>]

[-- Attachment #1: 0004-tracing-Update-branch-trace-to-new-event-API.patch --]
[-- Type: text/plain, Size: 1208 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

The branch tracer was not updated with the updates to shrink
TRACE_EVENT(). Although the branch tracer does not use TRACE_EVENT()
some of the API changes caused it to fail to compile.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 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 =
-- 
1.7.0