diff options
-rw-r--r-- | arch/sparc/vdso/vclock_gettime.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/vdso/vclock_gettime.c b/arch/sparc/vdso/vclock_gettime.c index 7b5bf63fc0f5..7b539ceebe13 100644 --- a/arch/sparc/vdso/vclock_gettime.c +++ b/arch/sparc/vdso/vclock_gettime.c | |||
@@ -138,7 +138,6 @@ notrace static __always_inline int do_realtime(struct vvar_data *vvar, | |||
138 | unsigned long seq; | 138 | unsigned long seq; |
139 | u64 ns; | 139 | u64 ns; |
140 | 140 | ||
141 | ts->tv_nsec = 0; | ||
142 | do { | 141 | do { |
143 | seq = vvar_read_begin(vvar); | 142 | seq = vvar_read_begin(vvar); |
144 | ts->tv_sec = vvar->wall_time_sec; | 143 | ts->tv_sec = vvar->wall_time_sec; |
@@ -147,7 +146,8 @@ notrace static __always_inline int do_realtime(struct vvar_data *vvar, | |||
147 | ns >>= vvar->clock.shift; | 146 | ns >>= vvar->clock.shift; |
148 | } while (unlikely(vvar_read_retry(vvar, seq))); | 147 | } while (unlikely(vvar_read_retry(vvar, seq))); |
149 | 148 | ||
150 | timespec_add_ns(ts, ns); | 149 | ts->tv_sec += __iter_div_u64_rem(ns, NSEC_PER_SEC, &ns); |
150 | ts->tv_nsec = ns; | ||
151 | 151 | ||
152 | return 0; | 152 | return 0; |
153 | } | 153 | } |
@@ -158,7 +158,6 @@ notrace static __always_inline int do_monotonic(struct vvar_data *vvar, | |||
158 | unsigned long seq; | 158 | unsigned long seq; |
159 | u64 ns; | 159 | u64 ns; |
160 | 160 | ||
161 | ts->tv_nsec = 0; | ||
162 | do { | 161 | do { |
163 | seq = vvar_read_begin(vvar); | 162 | seq = vvar_read_begin(vvar); |
164 | ts->tv_sec = vvar->monotonic_time_sec; | 163 | ts->tv_sec = vvar->monotonic_time_sec; |
@@ -167,7 +166,8 @@ notrace static __always_inline int do_monotonic(struct vvar_data *vvar, | |||
167 | ns >>= vvar->clock.shift; | 166 | ns >>= vvar->clock.shift; |
168 | } while (unlikely(vvar_read_retry(vvar, seq))); | 167 | } while (unlikely(vvar_read_retry(vvar, seq))); |
169 | 168 | ||
170 | timespec_add_ns(ts, ns); | 169 | ts->tv_sec += __iter_div_u64_rem(ns, NSEC_PER_SEC, &ns); |
170 | ts->tv_nsec = ns; | ||
171 | 171 | ||
172 | return 0; | 172 | return 0; |
173 | } | 173 | } |