aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/trace/events/sched.h6
-rw-r--r--kernel/sched.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index ffa1cab586b9..dd4033cf5b09 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -180,9 +180,9 @@ TRACE_EVENT(sched_switch,
180 */ 180 */
181TRACE_EVENT(sched_migrate_task, 181TRACE_EVENT(sched_migrate_task,
182 182
183 TP_PROTO(struct task_struct *p, int orig_cpu, int dest_cpu), 183 TP_PROTO(struct task_struct *p, int dest_cpu),
184 184
185 TP_ARGS(p, orig_cpu, dest_cpu), 185 TP_ARGS(p, dest_cpu),
186 186
187 TP_STRUCT__entry( 187 TP_STRUCT__entry(
188 __array( char, comm, TASK_COMM_LEN ) 188 __array( char, comm, TASK_COMM_LEN )
@@ -196,7 +196,7 @@ TRACE_EVENT(sched_migrate_task,
196 memcpy(__entry->comm, p->comm, TASK_COMM_LEN); 196 memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
197 __entry->pid = p->pid; 197 __entry->pid = p->pid;
198 __entry->prio = p->prio; 198 __entry->prio = p->prio;
199 __entry->orig_cpu = orig_cpu; 199 __entry->orig_cpu = task_cpu(p);
200 __entry->dest_cpu = dest_cpu; 200 __entry->dest_cpu = dest_cpu;
201 ), 201 ),
202 202
diff --git a/kernel/sched.c b/kernel/sched.c
index 9f7ffd00b6ea..9cdedbd181ce 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1954,7 +1954,7 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
1954 1954
1955 clock_offset = old_rq->clock - new_rq->clock; 1955 clock_offset = old_rq->clock - new_rq->clock;
1956 1956
1957 trace_sched_migrate_task(p, task_cpu(p), new_cpu); 1957 trace_sched_migrate_task(p, new_cpu);
1958 1958
1959#ifdef CONFIG_SCHEDSTATS 1959#ifdef CONFIG_SCHEDSTATS
1960 if (p->se.wait_start) 1960 if (p->se.wait_start)