Revert "rcu: Decrease memory-barrier usage based on semi-formal proof"

[karo-tx-linux.git] / kernel / trace / trace_entries.h

diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index 6cf223764be8aa72489567b90f44fb03d3fb7249..e32744c84d9497bd041a2e612d82f1f859406af9 100644 (file)
--- a/kernel/trace/trace_entries.h
+++ b/kernel/trace/trace_entries.h
@@ -27,7 +27,7 @@
  *       in the structure.
  *
  *   * for structures within structures, the format of the internal
- *     structure is layed out. This allows the internal structure
+ *     structure is laid out. This allows the internal structure
  *     to be deciphered for the format file. Although these macros
  *     may become out of sync with the internal structure, they
  *     will create a compile error if it happens. Since the
@@ -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,