From 80262f41303d4a3a5b6b900edb01b9fc4d15de55 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Thu, 5 Feb 2009 01:13:36 -0500
Subject: [PATCH] --- yaml --- r: 140688 b: refs/heads/master c:
 97e5b191ae7dc0f4f5b82b9db29782928b103b4d h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/kernel/trace/trace_branch.c | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 7a437623eaaf..11e4c76c588a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 268ccda0cb4d1292029d07ee3dbd07117baf6ecb
+refs/heads/master: 97e5b191ae7dc0f4f5b82b9db29782928b103b4d
diff --git a/trunk/kernel/trace/trace_branch.c b/trunk/kernel/trace/trace_branch.c
index 297deb202b68..027e83690615 100644
--- a/trunk/kernel/trace/trace_branch.c
+++ b/trunk/kernel/trace/trace_branch.c
@@ -143,23 +143,6 @@ static void branch_trace_reset(struct trace_array *tr)
 	stop_branch_trace(tr);
 }
 
-static int
-trace_print_print(struct trace_seq *s, struct trace_entry *entry, int flags)
-{
-	struct print_entry *field;
-
-	trace_assign_type(field, entry);
-
-	if (seq_print_ip_sym(s, field->ip, flags))
-		goto partial;
-
-	if (trace_seq_printf(s, ": %s", field->buf))
-		goto partial;
-
- partial:
-	return TRACE_TYPE_PARTIAL_LINE;
-}
-
 static enum print_line_t trace_branch_print(struct trace_iterator *iter,
 					    int flags)
 {