aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/sched_fair.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 44ec80ccfa85..4dec18579c9a 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1651,8 +1651,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
1651 int sync = wake_flags & WF_SYNC; 1651 int sync = wake_flags & WF_SYNC;
1652 int scale = cfs_rq->nr_running >= sched_nr_latency; 1652 int scale = cfs_rq->nr_running >= sched_nr_latency;
1653 1653
1654 update_curr(cfs_rq);
1655
1656 if (unlikely(rt_prio(p->prio))) { 1654 if (unlikely(rt_prio(p->prio))) {
1657 resched_task(curr); 1655 resched_task(curr);
1658 return; 1656 return;
@@ -1710,6 +1708,8 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
1710 1708
1711 BUG_ON(!pse); 1709 BUG_ON(!pse);
1712 1710
1711 update_curr(cfs_rq);
1712
1713 if (wakeup_preempt_entity(se, pse) == 1) { 1713 if (wakeup_preempt_entity(se, pse) == 1) {
1714 resched_task(curr); 1714 resched_task(curr);
1715 /* 1715 /*