aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 ca62f1973e2c..5576ead0dfd0 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -570,8 +570,7 @@ static void enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se)
570} 570}
571 571
572static void 572static void
573enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, 573enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int wakeup)
574 int wakeup, u64 now)
575{ 574{
576 /* 575 /*
577 * Update the fair clock. 576 * Update the fair clock.
@@ -680,7 +679,7 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
680 * position within the tree: 679 * position within the tree:
681 */ 680 */
682 dequeue_entity(cfs_rq, curr, 0, now); 681 dequeue_entity(cfs_rq, curr, 0, now);
683 enqueue_entity(cfs_rq, curr, 0, now); 682 enqueue_entity(cfs_rq, curr, 0);
684 683
685 /* 684 /*
686 * Reschedule if another task tops the current one. 685 * Reschedule if another task tops the current one.
@@ -795,7 +794,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int wakeup, u64 now)
795 if (se->on_rq) 794 if (se->on_rq)
796 break; 795 break;
797 cfs_rq = cfs_rq_of(se); 796 cfs_rq = cfs_rq_of(se);
798 enqueue_entity(cfs_rq, se, wakeup, now); 797 enqueue_entity(cfs_rq, se, wakeup);
799 } 798 }
800} 799}
801 800
@@ -834,7 +833,7 @@ static void yield_task_fair(struct rq *rq, struct task_struct *p)
834 * position within the tree: 833 * position within the tree:
835 */ 834 */
836 dequeue_entity(cfs_rq, &p->se, 0, now); 835 dequeue_entity(cfs_rq, &p->se, 0, now);
837 enqueue_entity(cfs_rq, &p->se, 0, now); 836 enqueue_entity(cfs_rq, &p->se, 0);
838} 837}
839 838
840/* 839/*