From 02f20885cbbaa96f55d5829a1de11ebaa388264a Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 5 May 2009 16:49:59 +0800 Subject: [PATCH] --- yaml --- r: 146095 b: refs/heads/master c: de1d7286060430e79a1d50ad6e5fee8fe863c5f6 h: refs/heads/master i: 146093: 662feb9dc3dc9f65b5b7b8475599bac14224f333 146091: 3d2e77b5159904b2a1e512119ddd9dca0c1dd9fd 146087: 7553ba80f435a8912dc25de060b492206fd1d2c9 146079: 01b5f1be977ae242915b9feb49e4719475ff6812 v: v3 --- [refs] | 2 +- trunk/include/trace/events/sched.h | 6 +++--- trunk/kernel/sched.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f2f915665463..85a8ff5c3521 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20c8928abe70e204bd077ab6cfe23002d7788983 +refs/heads/master: de1d7286060430e79a1d50ad6e5fee8fe863c5f6 diff --git a/trunk/include/trace/events/sched.h b/trunk/include/trace/events/sched.h index ffa1cab586b9..dd4033cf5b09 100644 --- a/trunk/include/trace/events/sched.h +++ b/trunk/include/trace/events/sched.h @@ -180,9 +180,9 @@ TRACE_EVENT(sched_switch, */ TRACE_EVENT(sched_migrate_task, - TP_PROTO(struct task_struct *p, int orig_cpu, int dest_cpu), + TP_PROTO(struct task_struct *p, int dest_cpu), - TP_ARGS(p, orig_cpu, dest_cpu), + TP_ARGS(p, dest_cpu), TP_STRUCT__entry( __array( char, comm, TASK_COMM_LEN ) @@ -196,7 +196,7 @@ TRACE_EVENT(sched_migrate_task, memcpy(__entry->comm, p->comm, TASK_COMM_LEN); __entry->pid = p->pid; __entry->prio = p->prio; - __entry->orig_cpu = orig_cpu; + __entry->orig_cpu = task_cpu(p); __entry->dest_cpu = dest_cpu; ), diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 9f7ffd00b6ea..9cdedbd181ce 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1954,7 +1954,7 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu) clock_offset = old_rq->clock - new_rq->clock; - trace_sched_migrate_task(p, task_cpu(p), new_cpu); + trace_sched_migrate_task(p, new_cpu); #ifdef CONFIG_SCHEDSTATS if (p->se.wait_start)