4 files changed, 26 insertions, 1 deletions

diff --git a/include/trace/sched_event_types.h b/include/trace/sched_event_types.h
index ba059c10b58a..a6de5c1601a0 100644
--- a/include/trace/sched_event_types.h
+++ b/include/trace/sched_event_types.h
@@ -71,10 +71,15 @@ TRACE_EVENT_FORMAT(sched_switch,
         TRACE_STRUCT(
                 TRACE_FIELD(pid_t, prev_pid, prev->pid)
                 TRACE_FIELD(int, prev_prio, prev->prio)
+                TRACE_FIELD_SPECIAL(char next_comm[TASK_COMM_LEN],
+                                    next_comm,
+                                    TPCMD(memcpy(TRACE_ENTRY->next_comm,
+                                                 next->comm,
+                                                 TASK_COMM_LEN)))
                 TRACE_FIELD(pid_t, next_pid, next->pid)
                 TRACE_FIELD(int, next_prio, next->prio)
         ),
-        TPRAWFMT("prev %d:%d ==> next %d:%d")
+        TPRAWFMT("prev %d:%d ==> next %s:%d:%d")
         );
 
 TRACE_EVENT_FORMAT(sched_migrate_task,
diff --git a/kernel/trace/trace_events_stage_1.h b/kernel/trace/trace_events_stage_1.h
index fd3bf9382d37..3830a731424c 100644
--- a/kernel/trace/trace_events_stage_1.h
+++ b/kernel/trace/trace_events_stage_1.h
@@ -30,5 +30,7 @@
 
 #define TRACE_FIELD(type, item, assign) \
         type item;
+#define TRACE_FIELD_SPECIAL(type_item, item, cmd) \
+        type_item;
 
 #include <trace/trace_event_types.h>
diff --git a/kernel/trace/trace_events_stage_2.h b/kernel/trace/trace_events_stage_2.h
index 3eaaef5f19e1..dc79fe3a2ecb 100644
--- a/kernel/trace/trace_events_stage_2.h
+++ b/kernel/trace/trace_events_stage_2.h
@@ -39,6 +39,10 @@
 #define TRACE_FIELD(type, item, assign) \
         field->item,
 
+#undef TRACE_FIELD_SPECIAL
+#define TRACE_FIELD_SPECIAL(type_item, item, cmd) \
+        field->item,
+
 
 #undef TPRAWFMT
 #define TPRAWFMT(args...)       args
diff --git a/kernel/trace/trace_events_stage_3.h b/kernel/trace/trace_events_stage_3.h
index 7a161c49deb4..2ab65e958223 100644
--- a/kernel/trace/trace_events_stage_3.h
+++ b/kernel/trace/trace_events_stage_3.h
@@ -147,6 +147,20 @@ __attribute__((section("_ftrace_events"))) event_##call = {		\
 #define TRACE_FIELD(type, item, assign)\
         entry->item = assign;
 
+#undef TRACE_FIELD
+#define TRACE_FIELD(type, item, assign)\
+        entry->item = assign;
+
+#undef TPCMD
+#define TPCMD(cmd...)   cmd
+
+#undef TRACE_ENTRY
+#define TRACE_ENTRY     entry
+
+#undef TRACE_FIELD_SPECIAL
+#define TRACE_FIELD_SPECIAL(type_item, item, cmd) \
+        cmd;
+
 #undef TRACE_EVENT_FORMAT
 #define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt)      \
 _TRACE_FORMAT(call, PARAMS(proto), PARAMS(args), PARAMS(fmt))           \