aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched_fair.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index bac2aff8273c..f0dd4be1a3a4 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -673,7 +673,7 @@ dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int sleep)
673/* 673/*
674 * Preempt the current task with a newly woken task if needed: 674 * Preempt the current task with a newly woken task if needed:
675 */ 675 */
676static int 676static void
677__check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se, 677__check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
678 struct sched_entity *curr, unsigned long granularity) 678 struct sched_entity *curr, unsigned long granularity)
679{ 679{
@@ -686,9 +686,8 @@ __check_preempt_curr_fair(struct cfs_rq *cfs_rq, struct sched_entity *se,
686 */ 686 */
687 if (__delta > niced_granularity(curr, granularity)) { 687 if (__delta > niced_granularity(curr, granularity)) {
688 resched_task(rq_of(cfs_rq)->curr); 688 resched_task(rq_of(cfs_rq)->curr);
689 return 1; 689 curr->prev_sum_exec_runtime = curr->sum_exec_runtime;
690 } 690 }
691 return 0;
692} 691}
693 692
694static inline void 693static inline void
@@ -764,8 +763,7 @@ static void entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
764 if (delta_exec > ideal_runtime) 763 if (delta_exec > ideal_runtime)
765 gran = 0; 764 gran = 0;
766 765
767 if (__check_preempt_curr_fair(cfs_rq, next, curr, gran)) 766 __check_preempt_curr_fair(cfs_rq, next, curr, gran);
768 curr->prev_sum_exec_runtime = curr->sum_exec_runtime;
769} 767}
770 768
771/************************************************** 769/**************************************************