aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/sched.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 67d9d1799d86..c6e551de795b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -488,7 +488,12 @@ unsigned long long cpu_clock(int cpu)
488 488
489 local_irq_save(flags); 489 local_irq_save(flags);
490 rq = cpu_rq(cpu); 490 rq = cpu_rq(cpu);
491 update_rq_clock(rq); 491 /*
492 * Only call sched_clock() if the scheduler has already been
493 * initialized (some code might call cpu_clock() very early):
494 */
495 if (rq->idle)
496 update_rq_clock(rq);
492 now = rq->clock; 497 now = rq->clock;
493 local_irq_restore(flags); 498 local_irq_restore(flags);
494 499