From ab8bb3076a8b3bb5fe3c35a24ea82a37723d8f97 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Mon, 14 Sep 2009 15:55:18 +0800
Subject: [PATCH] --- yaml --- r: 162972 b: refs/heads/master c:
 20a58a77231c5f5f61470932503b889303e8d4f3 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/kernel/trace/trace_entries.h |  9 ---------
 trunk/kernel/trace/trace_export.c  | 26 --------------------------
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/[refs] b/[refs]
index 2ecde59cfc92..283450fae5c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05ffa2d02066c2cb169c02d5417308ee8ecab638
+refs/heads/master: 20a58a77231c5f5f61470932503b889303e8d4f3
diff --git a/trunk/kernel/trace/trace_entries.h b/trunk/kernel/trace/trace_entries.h
index 0c100958c642..a431748ddd6e 100644
--- a/trunk/kernel/trace/trace_entries.h
+++ b/trunk/kernel/trace/trace_entries.h
@@ -116,15 +116,6 @@ FTRACE_ENTRY(funcgraph_exit, ftrace_graph_ret_entry,
 	__field(	unsigned char,	next_state	)	\
 	__field(	unsigned int,	next_cpu	)
 
-#if 0
-FTRACE_ENTRY_STRUCT_ONLY(ctx_switch_entry,
-
-	F_STRUCT(
-		FTRACE_CTX_FIELDS
-	)
-);
-#endif
-
 FTRACE_ENTRY(context_switch, ctx_switch_entry,
 
 	TRACE_CTX,
diff --git a/trunk/kernel/trace/trace_export.c b/trunk/kernel/trace/trace_export.c
index 2435d55947e6..9753fcc61bc5 100644
--- a/trunk/kernel/trace/trace_export.c
+++ b/trunk/kernel/trace/trace_export.c
@@ -209,32 +209,6 @@ ftrace_define_fields_##name(struct ftrace_event_call *event_call)	\
 #undef __dynamic_array
 #define __dynamic_array(type, item)
 
-
-#undef TRACE_ZERO_CHAR
-#define TRACE_ZERO_CHAR(arg)
-
-#undef TRACE_FIELD
-#define TRACE_FIELD(type, item, assign)\
-	entry->item = assign;
-
-#undef TRACE_FIELD
-#define TRACE_FIELD(type, item, assign)\
-	entry->item = assign;
-
-#undef TRACE_FIELD_SIGN
-#define TRACE_FIELD_SIGN(type, item, assign, is_signed)	\
-	TRACE_FIELD(type, item, assign)
-
-#undef TP_CMD
-#define TP_CMD(cmd...)	cmd
-
-#undef TRACE_ENTRY
-#define TRACE_ENTRY	entry
-
-#undef TRACE_FIELD_SPECIAL
-#define TRACE_FIELD_SPECIAL(type_item, item, len, cmd)	\
-	cmd;
-
 #undef FTRACE_ENTRY
 #define FTRACE_ENTRY(call, struct_name, type, tstruct, print)		\
 static int ftrace_raw_init_event_##call(void);				\