Merge branch 'linus' into x86/urgent

[deliverable/linux.git] / kernel / trace / trace_entries.h

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index 6cf223764be8aa72489567b90f44fb03d3fb7249..1516cb3ec549a1bd090df147cc156686df3fcd6a 100644 (file)
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -109,12 +109,12 @@ FTRACE_ENTRY(funcgraph_exit, ftrace_graph_ret_entry,
  */
 #define FTRACE_CTX_FIELDS                                      \
        __field(        unsigned int,   prev_pid        )       \
+       __field(        unsigned int,   next_pid        )       \
+       __field(        unsigned int,   next_cpu        )       \
        __field(        unsigned char,  prev_prio       )       \
        __field(        unsigned char,  prev_state      )       \
-       __field(        unsigned int,   next_pid        )       \
        __field(        unsigned char,  next_prio       )       \
-       __field(        unsigned char,  next_state      )       \
-       __field(        unsigned int,   next_cpu        )
+       __field(        unsigned char,  next_state      )
 
 FTRACE_ENTRY(context_switch, ctx_switch_entry,