summaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index f9778c0d91e2..b8b9a7dac9b0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -466,7 +466,7 @@ struct rq {
466 u64 nohz_stamp; 466 u64 nohz_stamp;
467 unsigned char nohz_balance_kick; 467 unsigned char nohz_balance_kick;
468#endif 468#endif
469 unsigned int skip_clock_update; 469 int skip_clock_update;
470 470
471 /* capture load from *all* tasks on this cpu: */ 471 /* capture load from *all* tasks on this cpu: */
472 struct load_weight load; 472 struct load_weight load;
@@ -652,7 +652,7 @@ static void update_rq_clock(struct rq *rq)
652{ 652{
653 s64 delta; 653 s64 delta;
654 654
655 if (rq->skip_clock_update) 655 if (rq->skip_clock_update > 0)
656 return; 656 return;
657 657
658 delta = sched_clock_cpu(cpu_of(rq)) - rq->clock; 658 delta = sched_clock_cpu(cpu_of(rq)) - rq->clock;
@@ -4127,7 +4127,7 @@ static inline void schedule_debug(struct task_struct *prev)
4127 4127
4128static void put_prev_task(struct rq *rq, struct task_struct *prev) 4128static void put_prev_task(struct rq *rq, struct task_struct *prev)
4129{ 4129{
4130 if (prev->on_rq) 4130 if (prev->on_rq || rq->skip_clock_update < 0)
4131 update_rq_clock(rq); 4131 update_rq_clock(rq);
4132 prev->sched_class->put_prev_task(rq, prev); 4132 prev->sched_class->put_prev_task(rq, prev);
4133} 4133}