aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/sched.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 01fd131b47a4..1f9c6d99f15d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2060,23 +2060,12 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd)
2060void set_task_cpu(struct task_struct *p, unsigned int new_cpu) 2060void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
2061{ 2061{
2062 int old_cpu = task_cpu(p); 2062 int old_cpu = task_cpu(p);
2063 struct rq *old_rq = cpu_rq(old_cpu), *new_rq = cpu_rq(new_cpu); 2063 struct rq *old_rq = cpu_rq(old_cpu);
2064 struct cfs_rq *old_cfsrq = task_cfs_rq(p), 2064 struct cfs_rq *old_cfsrq = task_cfs_rq(p),
2065 *new_cfsrq = cpu_cfs_rq(old_cfsrq, new_cpu); 2065 *new_cfsrq = cpu_cfs_rq(old_cfsrq, new_cpu);
2066 u64 clock_offset;
2067
2068 clock_offset = old_rq->clock - new_rq->clock;
2069 2066
2070 trace_sched_migrate_task(p, new_cpu); 2067 trace_sched_migrate_task(p, new_cpu);
2071 2068
2072#ifdef CONFIG_SCHEDSTATS
2073 if (p->se.wait_start)
2074 p->se.wait_start -= clock_offset;
2075 if (p->se.sleep_start)
2076 p->se.sleep_start -= clock_offset;
2077 if (p->se.block_start)
2078 p->se.block_start -= clock_offset;
2079#endif
2080 if (old_cpu != new_cpu) { 2069 if (old_cpu != new_cpu) {
2081 p->se.nr_migrations++; 2070 p->se.nr_migrations++;
2082#ifdef CONFIG_SCHEDSTATS 2071#ifdef CONFIG_SCHEDSTATS