aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 6c571bdd5658..f92ce63edfff 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2038,8 +2038,6 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd)
2038void set_task_cpu(struct task_struct *p, unsigned int new_cpu) 2038void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
2039{ 2039{
2040 int old_cpu = task_cpu(p); 2040 int old_cpu = task_cpu(p);
2041 struct cfs_rq *old_cfsrq = task_cfs_rq(p),
2042 *new_cfsrq = cpu_cfs_rq(old_cfsrq, new_cpu);
2043 2041
2044#ifdef CONFIG_SCHED_DEBUG 2042#ifdef CONFIG_SCHED_DEBUG
2045 /* 2043 /*
@@ -2056,8 +2054,6 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
2056 perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 2054 perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS,
2057 1, 1, NULL, 0); 2055 1, 1, NULL, 0);
2058 } 2056 }
2059 p->se.vruntime -= old_cfsrq->min_vruntime -
2060 new_cfsrq->min_vruntime;
2061 2057
2062 __set_task_cpu(p, new_cpu); 2058 __set_task_cpu(p, new_cpu);
2063} 2059}
@@ -10102,7 +10098,7 @@ void sched_move_task(struct task_struct *tsk)
10102 10098
10103#ifdef CONFIG_FAIR_GROUP_SCHED 10099#ifdef CONFIG_FAIR_GROUP_SCHED
10104 if (tsk->sched_class->moved_group) 10100 if (tsk->sched_class->moved_group)
10105 tsk->sched_class->moved_group(tsk); 10101 tsk->sched_class->moved_group(tsk, on_rq);
10106#endif 10102#endif
10107 10103
10108 if (unlikely(running)) 10104 if (unlikely(running))