aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/hrtimer.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r--kernel/hrtimer.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index ca99e2454600..e8bf3ad99063 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -91,9 +91,9 @@ static inline int hrtimer_clockid_to_base(clockid_t clock_id)
91static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base) 91static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)
92{ 92{
93 ktime_t xtim, tomono; 93 ktime_t xtim, tomono;
94 struct timespec xts, tom; 94 struct timespec xts, tom, slp;
95 95
96 get_xtime_and_monotonic_offset(&xts, &tom); 96 get_xtime_and_monotonic_and_sleep_offset(&xts, &tom, &slp);
97 97
98 xtim = timespec_to_ktime(xts); 98 xtim = timespec_to_ktime(xts);
99 tomono = timespec_to_ktime(tom); 99 tomono = timespec_to_ktime(tom);
@@ -614,12 +614,13 @@ static int hrtimer_reprogram(struct hrtimer *timer,
614static void retrigger_next_event(void *arg) 614static void retrigger_next_event(void *arg)
615{ 615{
616 struct hrtimer_cpu_base *base; 616 struct hrtimer_cpu_base *base;
617 struct timespec realtime_offset, wtm; 617 struct timespec realtime_offset, wtm, sleep;
618 618
619 if (!hrtimer_hres_active()) 619 if (!hrtimer_hres_active())
620 return; 620 return;
621 621
622 get_xtime_and_monotonic_offset(&realtime_offset, &wtm); 622 get_xtime_and_monotonic_and_sleep_offset(&realtime_offset, &wtm,
623 &sleep);
623 set_normalized_timespec(&realtime_offset, -wtm.tv_sec, -wtm.tv_nsec); 624 set_normalized_timespec(&realtime_offset, -wtm.tv_sec, -wtm.tv_nsec);
624 625
625 base = &__get_cpu_var(hrtimer_bases); 626 base = &__get_cpu_var(hrtimer_bases);