summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorDavid Sharp <dhsharp@google.com>2010-12-03 16:13:19 -0800
committerSteven Rostedt <rostedt@goodmis.org>2011-03-10 10:34:16 -0500
commit140e4f2d1cd816aed196705c036763313c0e4bd3 (patch)
tree0885c7588519f3d465424576278809d7c008b061 /kernel/trace
parente6e1e2593592a8f6f6380496655d8c6f67431266 (diff)
downloadlinux-140e4f2d1cd816aed196705c036763313c0e4bd3.tar.gz
linux-140e4f2d1cd816aed196705c036763313c0e4bd3.tar.bz2
linux-140e4f2d1cd816aed196705c036763313c0e4bd3.zip
tracing: Fix event alignment: ftrace:context_switch and ftrace:wakeup
Signed-off-by: David Sharp <dhsharp@google.com> LKML-Reference: <1291421609-14665-6-git-send-email-dhsharp@google.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace_entries.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
index 6cf223764be8..1516cb3ec549 100644
--- 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,