diff options
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r-- | kernel/hrtimer.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 5c69e996bd0f..809f48c70553 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -90,7 +90,7 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base) | |||
90 | do { | 90 | do { |
91 | seq = read_seqbegin(&xtime_lock); | 91 | seq = read_seqbegin(&xtime_lock); |
92 | xts = __current_kernel_time(); | 92 | xts = __current_kernel_time(); |
93 | tom = wall_to_monotonic; | 93 | tom = __get_wall_to_monotonic(); |
94 | } while (read_seqretry(&xtime_lock, seq)); | 94 | } while (read_seqretry(&xtime_lock, seq)); |
95 | 95 | ||
96 | xtim = timespec_to_ktime(xts); | 96 | xtim = timespec_to_ktime(xts); |
@@ -612,7 +612,7 @@ static int hrtimer_reprogram(struct hrtimer *timer, | |||
612 | static void retrigger_next_event(void *arg) | 612 | static void retrigger_next_event(void *arg) |
613 | { | 613 | { |
614 | struct hrtimer_cpu_base *base; | 614 | struct hrtimer_cpu_base *base; |
615 | struct timespec realtime_offset; | 615 | struct timespec realtime_offset, wtm; |
616 | unsigned long seq; | 616 | unsigned long seq; |
617 | 617 | ||
618 | if (!hrtimer_hres_active()) | 618 | if (!hrtimer_hres_active()) |
@@ -620,10 +620,9 @@ static void retrigger_next_event(void *arg) | |||
620 | 620 | ||
621 | do { | 621 | do { |
622 | seq = read_seqbegin(&xtime_lock); | 622 | seq = read_seqbegin(&xtime_lock); |
623 | set_normalized_timespec(&realtime_offset, | 623 | wtm = __get_wall_to_monotonic(); |
624 | -wall_to_monotonic.tv_sec, | ||
625 | -wall_to_monotonic.tv_nsec); | ||
626 | } while (read_seqretry(&xtime_lock, seq)); | 624 | } while (read_seqretry(&xtime_lock, seq)); |
625 | set_normalized_timespec(&realtime_offset, -wtm.tv_sec, -wtm.tv_nsec); | ||
627 | 626 | ||
628 | base = &__get_cpu_var(hrtimer_bases); | 627 | base = &__get_cpu_var(hrtimer_bases); |
629 | 628 | ||