tracing: flip the TP_printk and TP_fast_assign in the TRACE_EVENT macro

Impact: clean up

In trying to stay consistant with the C style format in the TRACE_EVENT
macro, it makes more sense to do the printk after the assigning of
the variables.

Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/kernel/trace/trace_events_stage_1.h b/kernel/trace/trace_events_stage_1.h
index 15e9bf965a18..82f68443c556 100644
--- a/kernel/trace/trace_events_stage_1.h
+++ b/kernel/trace/trace_events_stage_1.h
@@ -27,7 +27,7 @@
 #define TP_STRUCT__entry(args...) args
 
 #undef TRACE_EVENT
-#define TRACE_EVENT(name, proto, args, tstruct, print, assign)  \
+#define TRACE_EVENT(name, proto, args, tstruct, assign, print)  \
         struct ftrace_raw_##name {                              \
                 struct trace_entry      ent;                    \
                 tstruct                                         \
diff --git a/kernel/trace/trace_events_stage_2.h b/kernel/trace/trace_events_stage_2.h
index d91bf4c56661..1ad9f8d2fe45 100644
--- a/kernel/trace/trace_events_stage_2.h
+++ b/kernel/trace/trace_events_stage_2.h
@@ -39,7 +39,7 @@
 #define TP_printk(fmt, args...) fmt "\n", args
 
 #undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, print, assign)          \
+#define TRACE_EVENT(call, proto, args, tstruct, assign, print)          \
 enum print_line_t                                                       \
 ftrace_raw_output_##call(struct trace_iterator *iter, int flags)        \
 {                                                                       \
@@ -115,7 +115,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags)	\
 #define TP_fast_assign(args...) args
 
 #undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, print, func)            \
+#define TRACE_EVENT(call, proto, args, tstruct, func, print)            \
 static int                                                              \
 ftrace_format_##call(struct trace_seq *s)                               \
 {                                                                       \
diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h
index 3ba55d4ab073..d6de06b9201a 100644
--- a/kernel/trace/trace_events_stage_3.h
+++ b/kernel/trace/trace_events_stage_3.h
@@ -148,7 +148,7 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
 #define __entry entry
 
 #undef TRACE_EVENT
-#define TRACE_EVENT(call, proto, args, tstruct, print, assign)          \
+#define TRACE_EVENT(call, proto, args, tstruct, assign, print)          \
                                                                         \
 static struct ftrace_event_call event_##call;                           \
                                                                         \