diff options
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r-- | kernel/hrtimer.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 0c8d7c048615..57c4d33c9a9d 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -85,13 +85,8 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base) | |||
85 | { | 85 | { |
86 | ktime_t xtim, tomono; | 86 | ktime_t xtim, tomono; |
87 | struct timespec xts, tom; | 87 | struct timespec xts, tom; |
88 | unsigned long seq; | ||
89 | 88 | ||
90 | do { | 89 | get_xtime_and_monotonic_offset(&xts, &tom); |
91 | seq = read_seqbegin(&xtime_lock); | ||
92 | xts = __current_kernel_time(); | ||
93 | tom = __get_wall_to_monotonic(); | ||
94 | } while (read_seqretry(&xtime_lock, seq)); | ||
95 | 90 | ||
96 | xtim = timespec_to_ktime(xts); | 91 | xtim = timespec_to_ktime(xts); |
97 | tomono = timespec_to_ktime(tom); | 92 | tomono = timespec_to_ktime(tom); |
@@ -612,15 +607,11 @@ static void retrigger_next_event(void *arg) | |||
612 | { | 607 | { |
613 | struct hrtimer_cpu_base *base; | 608 | struct hrtimer_cpu_base *base; |
614 | struct timespec realtime_offset, wtm; | 609 | struct timespec realtime_offset, wtm; |
615 | unsigned long seq; | ||
616 | 610 | ||
617 | if (!hrtimer_hres_active()) | 611 | if (!hrtimer_hres_active()) |
618 | return; | 612 | return; |
619 | 613 | ||
620 | do { | 614 | get_xtime_and_monotonic_offset(&realtime_offset, &wtm); |
621 | seq = read_seqbegin(&xtime_lock); | ||
622 | wtm = __get_wall_to_monotonic(); | ||
623 | } while (read_seqretry(&xtime_lock, seq)); | ||
624 | set_normalized_timespec(&realtime_offset, -wtm.tv_sec, -wtm.tv_nsec); | 615 | set_normalized_timespec(&realtime_offset, -wtm.tv_sec, -wtm.tv_nsec); |
625 | 616 | ||
626 | base = &__get_cpu_var(hrtimer_bases); | 617 | base = &__get_cpu_var(hrtimer_bases); |