aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/sched_fair.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 3179d1129a80..45c7493d8ca8 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -582,8 +582,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep)
582 * Preempt the current task with a newly woken task if needed: 582 * Preempt the current task with a newly woken task if needed:
583 */ 583 */
584static void 584static void
585__check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se, 585__check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *curr)
586 struct sched_entity *curr)
587{ 586{
588 unsigned long ideal_runtime, delta_exec; 587 unsigned long ideal_runtime, delta_exec;
589 588
@@ -663,7 +662,7 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
663 if (next == curr) 662 if (next == curr)
664 return; 663 return;
665 664
666 __check_preempt_curr_fair(cfs_rq, next, curr); 665 __check_preempt_curr_fair(cfs_rq, curr);
667} 666}
668 667
669/************************************************** 668/**************************************************
@@ -866,7 +865,7 @@ static void check_preempt_curr_fair(struct rq *rq, struct task_struct *p)
866 } 865 }
867 866
868 if (is_same_group(curr, p)) 867 if (is_same_group(curr, p))
869 __check_preempt_curr_fair(cfs_rq, &p->se, &curr->se); 868 __check_preempt_curr_fair(cfs_rq, &curr->se);
870} 869}
871 870
872static struct task_struct *pick_next_task_fair(struct rq *rq) 871static struct task_struct *pick_next_task_fair(struct rq *rq)