aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/time/hrtimer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index d32520840fde..aa9d2a2b1210 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -655,7 +655,9 @@ static void hrtimer_reprogram(struct hrtimer *timer,
655static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) 655static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base)
656{ 656{
657 base->expires_next = KTIME_MAX; 657 base->expires_next = KTIME_MAX;
658 base->hang_detected = 0;
658 base->hres_active = 0; 659 base->hres_active = 0;
660 base->next_timer = NULL;
659} 661}
660 662
661/* 663/*
@@ -1589,6 +1591,7 @@ int hrtimers_prepare_cpu(unsigned int cpu)
1589 timerqueue_init_head(&cpu_base->clock_base[i].active); 1591 timerqueue_init_head(&cpu_base->clock_base[i].active);
1590 } 1592 }
1591 1593
1594 cpu_base->active_bases = 0;
1592 cpu_base->cpu = cpu; 1595 cpu_base->cpu = cpu;
1593 hrtimer_init_hres(cpu_base); 1596 hrtimer_init_hres(cpu_base);
1594 return 0; 1597 return 0;