From 22339702677cf737301320714372acf68ff7b0f9 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Tue, 10 Mar 2009 00:15:34 -0400
Subject: [PATCH] --- yaml --- r: 140899 b: refs/heads/master c:
 157587d7ac555458da9f682e3250135e468470a6 h: refs/heads/master i:   140897:
 ddf3bd433fc829ed3c87d36e6d210e5a95bc27be   140895:
 343fdcbdee08500c59b08d59ff7169dda1d7f10d v: v3

---
 [refs]                                    | 2 +-
 trunk/include/linux/tracepoint.h          | 3 ---
 trunk/include/trace/lockdep_event_types.h | 2 +-
 trunk/include/trace/sched_event_types.h   | 2 +-
 trunk/kernel/trace/trace_events_stage_1.h | 3 ---
 trunk/kernel/trace/trace_events_stage_3.h | 6 +-----
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 93ded894afc4..ca5c84b7f598 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6e2ca4c05be6a5ab16030a9f227301bd6acc9f0
+refs/heads/master: 157587d7ac555458da9f682e3250135e468470a6
diff --git a/trunk/include/linux/tracepoint.h b/trunk/include/linux/tracepoint.h
index 6b4f1bb3701e..69b56988813d 100644
--- a/trunk/include/linux/tracepoint.h
+++ b/trunk/include/linux/tracepoint.h
@@ -157,9 +157,6 @@ static inline void tracepoint_synchronize_unregister(void)
 #define TRACE_FORMAT(name, proto, args, fmt)		\
 	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
 
-#define TRACE_EVENT_FORMAT(name, proto, args, fmt, struct, tpfmt)	\
-	TRACE_FORMAT(name, PARAMS(proto), PARAMS(args), PARAMS(fmt))
-
 #define TRACE_EVENT(name, proto, args, struct, print, assign)	\
 	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
 
diff --git a/trunk/include/trace/lockdep_event_types.h b/trunk/include/trace/lockdep_event_types.h
index 1f00e8b3543e..adccfcd2ec8f 100644
--- a/trunk/include/trace/lockdep_event_types.h
+++ b/trunk/include/trace/lockdep_event_types.h
@@ -1,5 +1,5 @@
 
-#ifndef TRACE_EVENT_FORMAT
+#ifndef TRACE_FORMAT
 # error Do not include this file directly.
 # error Unless you know what you are doing.
 #endif
diff --git a/trunk/include/trace/sched_event_types.h b/trunk/include/trace/sched_event_types.h
index 0bbbf410e01f..fb37af672c88 100644
--- a/trunk/include/trace/sched_event_types.h
+++ b/trunk/include/trace/sched_event_types.h
@@ -1,6 +1,6 @@
 
 /* use <trace/sched.h> instead */
-#ifndef TRACE_EVENT_FORMAT
+#ifndef TRACE_EVENT
 # error Do not include this file directly.
 # error Unless you know what you are doing.
 #endif
diff --git a/trunk/kernel/trace/trace_events_stage_1.h b/trunk/kernel/trace/trace_events_stage_1.h
index edfcbd3a0d1b..15e9bf965a18 100644
--- a/trunk/kernel/trace/trace_events_stage_1.h
+++ b/trunk/kernel/trace/trace_events_stage_1.h
@@ -17,9 +17,6 @@
 #undef TRACE_FORMAT
 #define TRACE_FORMAT(call, proto, args, fmt)
 
-#undef TRACE_EVENT_FORMAT
-#define TRACE_EVENT_FORMAT(name, proto, args, fmt, tstruct, tpfmt)
-
 #undef __array
 #define __array(type, item, len)	type	item[len];
 
diff --git a/trunk/kernel/trace/trace_events_stage_3.h b/trunk/kernel/trace/trace_events_stage_3.h
index 8e398d864096..3ba55d4ab073 100644
--- a/trunk/kernel/trace/trace_events_stage_3.h
+++ b/trunk/kernel/trace/trace_events_stage_3.h
@@ -35,7 +35,7 @@
  * }
  *
  *
- * For those macros defined with TRACE_EVENT_FORMAT:
+ * For those macros defined with TRACE_EVENT:
  *
  * static struct ftrace_event_call event_<call>;
  *
@@ -144,10 +144,6 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
 	.unregfunc		= ftrace_unreg_event_##call,		\
 }
 
-#undef TRACE_EVENT_FORMAT
-#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, raw)	\
-	TRACE_FORMAT(call, PARAMS(proto), PARAMS(args), PARAMS(fmt))
-
 #undef __entry
 #define __entry entry