1 files changed, 5 insertions, 4 deletions

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 98345e45b05..5ad4440f0fc 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -492,6 +492,8 @@ static void update_curr(struct cfs_rq *cfs_rq)
          * overflow on 32 bits):
          */
         delta_exec = (unsigned long)(now - curr->exec_start);
+        if (!delta_exec)
+                return;
 
         __update_curr(cfs_rq, curr, delta_exec);
         curr->exec_start = now;
@@ -1345,12 +1347,11 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int sync)
 {
         struct task_struct *curr = rq->curr;
         struct sched_entity *se = &curr->se, *pse = &p->se;
+        struct cfs_rq *cfs_rq = task_cfs_rq(curr);
 
-        if (unlikely(rt_prio(p->prio))) {
-                struct cfs_rq *cfs_rq = task_cfs_rq(curr);
+        update_curr(cfs_rq);
 
-                update_rq_clock(rq);
-                update_curr(cfs_rq);
+        if (unlikely(rt_prio(p->prio))) {
                 resched_task(curr);
                 return;
         }