aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched_fair.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sched_fair.c')
-rw-r--r--kernel/sched_fair.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 5576ead0dfd0..da92b78570c0 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -585,8 +585,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int wakeup)
585} 585}
586 586
587static void 587static void
588dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, 588dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep)
589 int sleep, u64 now)
590{ 589{
591 update_stats_dequeue(cfs_rq, se); 590 update_stats_dequeue(cfs_rq, se);
592 if (sleep) { 591 if (sleep) {
@@ -678,7 +677,7 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
678 * Dequeue and enqueue the task to update its 677 * Dequeue and enqueue the task to update its
679 * position within the tree: 678 * position within the tree:
680 */ 679 */
681 dequeue_entity(cfs_rq, curr, 0, now); 680 dequeue_entity(cfs_rq, curr, 0);
682 enqueue_entity(cfs_rq, curr, 0); 681 enqueue_entity(cfs_rq, curr, 0);
683 682
684 /* 683 /*
@@ -811,7 +810,7 @@ dequeue_task_fair(struct rq *rq, struct task_struct *p, int sleep, u64 now)
811 810
812 for_each_sched_entity(se) { 811 for_each_sched_entity(se) {
813 cfs_rq = cfs_rq_of(se); 812 cfs_rq = cfs_rq_of(se);
814 dequeue_entity(cfs_rq, se, sleep, now); 813 dequeue_entity(cfs_rq, se, sleep);
815 /* Don't dequeue parent if it has other entities besides us */ 814 /* Don't dequeue parent if it has other entities besides us */
816 if (cfs_rq->load.weight) 815 if (cfs_rq->load.weight)
817 break; 816 break;
@@ -832,7 +831,7 @@ static void yield_task_fair(struct rq *rq, struct task_struct *p)
832 * Dequeue and enqueue the task to update its 831 * Dequeue and enqueue the task to update its
833 * position within the tree: 832 * position within the tree:
834 */ 833 */
835 dequeue_entity(cfs_rq, &p->se, 0, now); 834 dequeue_entity(cfs_rq, &p->se, 0);
836 enqueue_entity(cfs_rq, &p->se, 0); 835 enqueue_entity(cfs_rq, &p->se, 0);
837} 836}
838 837