diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-22 10:16:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-22 10:16:59 +0800 |
| commit | f7901365aa48b20b25f8402e0fd1eea4ac6c55e7 (patch) | |
| tree | 4cab2d6b92324c06a457c43a5c8bac55581cdfb5 /kernel/time/hrtimer.c | |
| parent | cd1fe2006b62234455a91e428bad45331dc79250 (diff) | |
| parent | 701115b70ba8e8b20c6cfe689db4c1dd6af3ece9 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.4-rt' into linux-linaro-lsk-v4.4-rt
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'kernel/time/hrtimer.c')
| -rw-r--r-- | kernel/time/hrtimer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 120fc8932165..e0bc4c4e2675 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -314,7 +314,7 @@ EXPORT_SYMBOL_GPL(__ktime_divns); */ ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs) { - ktime_t res = ktime_add(lhs, rhs); + ktime_t res = ktime_add_unsafe(lhs, rhs); /* * We use KTIME_SEC_MAX here, the maximum timeout which we can @@ -671,7 +671,9 @@ static void hrtimer_reprogram(struct hrtimer *timer, static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { base->expires_next.tv64 = KTIME_MAX; + base->hang_detected = 0; base->hres_active = 0; + base->next_timer = NULL; } /* @@ -1848,6 +1850,7 @@ static void init_hrtimers_cpu(int cpu) INIT_LIST_HEAD(&cpu_base->clock_base[i].expired); } + cpu_base->active_bases = 0; cpu_base->cpu = cpu; hrtimer_init_hres(cpu_base); #ifdef CONFIG_PREEMPT_RT_BASE |