1 files changed, 6 insertions, 2 deletions

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 923bed0b0c42..969f08c8bd34 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -844,7 +844,8 @@ static void check_preempt_curr_fair(struct rq *rq, struct task_struct *p)
         unsigned long gran;
 
         if (unlikely(rt_prio(p->prio))) {
-                update_curr(cfs_rq, rq_clock(rq));
+                update_rq_clock(rq);
+                update_curr(cfs_rq, rq->clock);
                 resched_task(curr);
                 return;
         }
@@ -1063,9 +1064,12 @@ static void set_curr_task_fair(struct rq *rq)
 {
         struct task_struct *curr = rq->curr;
         struct sched_entity *se = &curr->se;
-        u64 now = rq_clock(rq);
+        u64 now;
         struct cfs_rq *cfs_rq;
 
+        update_rq_clock(rq);
+        now = rq->clock;
+
         for_each_sched_entity(se) {
                 cfs_rq = cfs_rq_of(se);
                 set_next_entity(cfs_rq, se, now);