From b8cdb4f1ebb2ab6d990f9341892246fe98fb334c Mon Sep 17 00:00:00 2001 From: David Sharp Date: Fri, 3 Dec 2010 16:13:19 -0800 Subject: [PATCH] --- yaml --- r: 234519 b: refs/heads/master c: 140e4f2d1cd816aed196705c036763313c0e4bd3 h: refs/heads/master i: 234517: caa4a91a670b70651b880499401c7731cf8725e8 234515: 153ffe6f127aa0297b709d100267dc9019c4fd1e 234511: 565a53e7e7968fb859206fe1bb174a63f1fe22fe v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_entries.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3427908d1a62..187c80c20cb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6e1e2593592a8f6f6380496655d8c6f67431266 +refs/heads/master: 140e4f2d1cd816aed196705c036763313c0e4bd3 diff --git a/trunk/kernel/trace/trace_entries.h b/trunk/kernel/trace/trace_entries.h index 6cf223764be8..1516cb3ec549 100644 --- a/trunk/kernel/trace/trace_entries.h +++ b/trunk/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,