aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time/hrtimer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/time/hrtimer.c')
-rw-r--r--kernel/time/hrtimer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 9ba7c820fc23..bb5ec425dfe0 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -307,7 +307,7 @@ EXPORT_SYMBOL_GPL(__ktime_divns);
307 */ 307 */
308ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs) 308ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs)
309{ 309{
310 ktime_t res = ktime_add(lhs, rhs); 310 ktime_t res = ktime_add_unsafe(lhs, rhs);
311 311
312 /* 312 /*
313 * We use KTIME_SEC_MAX here, the maximum timeout which we can 313 * We use KTIME_SEC_MAX here, the maximum timeout which we can
@@ -703,7 +703,7 @@ static void clock_was_set_work(struct work_struct *work)
703static DECLARE_WORK(hrtimer_work, clock_was_set_work); 703static DECLARE_WORK(hrtimer_work, clock_was_set_work);
704 704
705/* 705/*
706 * Called from timekeeping and resume code to reprogramm the hrtimer 706 * Called from timekeeping and resume code to reprogram the hrtimer
707 * interrupt device on all cpus. 707 * interrupt device on all cpus.
708 */ 708 */
709void clock_was_set_delayed(void) 709void clock_was_set_delayed(void)
@@ -1241,7 +1241,7 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,
1241 1241
1242 /* 1242 /*
1243 * Note: We clear the running state after enqueue_hrtimer and 1243 * Note: We clear the running state after enqueue_hrtimer and
1244 * we do not reprogramm the event hardware. Happens either in 1244 * we do not reprogram the event hardware. Happens either in
1245 * hrtimer_start_range_ns() or in hrtimer_interrupt() 1245 * hrtimer_start_range_ns() or in hrtimer_interrupt()
1246 * 1246 *
1247 * Note: Because we dropped the cpu_base->lock above, 1247 * Note: Because we dropped the cpu_base->lock above,