diff options
Diffstat (limited to 'kernel/time/timekeeping.c')
-rw-r--r-- | kernel/time/timekeeping.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 7c2851384c46..ce618010c373 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -42,15 +42,6 @@ static inline void tk_normalize_xtime(struct timekeeper *tk) | |||
42 | } | 42 | } |
43 | } | 43 | } |
44 | 44 | ||
45 | static struct timespec tk_xtime(struct timekeeper *tk) | ||
46 | { | ||
47 | struct timespec ts; | ||
48 | |||
49 | ts.tv_sec = tk->xtime_sec; | ||
50 | ts.tv_nsec = (long)(tk->xtime_nsec >> tk->shift); | ||
51 | return ts; | ||
52 | } | ||
53 | |||
54 | static void tk_set_xtime(struct timekeeper *tk, const struct timespec *ts) | 45 | static void tk_set_xtime(struct timekeeper *tk, const struct timespec *ts) |
55 | { | 46 | { |
56 | tk->xtime_sec = ts->tv_sec; | 47 | tk->xtime_sec = ts->tv_sec; |
@@ -192,14 +183,11 @@ static inline s64 timekeeping_get_ns_raw(struct timekeeper *tk) | |||
192 | /* must hold write on timekeeper.lock */ | 183 | /* must hold write on timekeeper.lock */ |
193 | static void timekeeping_update(struct timekeeper *tk, bool clearntp) | 184 | static void timekeeping_update(struct timekeeper *tk, bool clearntp) |
194 | { | 185 | { |
195 | struct timespec xt; | ||
196 | |||
197 | if (clearntp) { | 186 | if (clearntp) { |
198 | tk->ntp_error = 0; | 187 | tk->ntp_error = 0; |
199 | ntp_clear(); | 188 | ntp_clear(); |
200 | } | 189 | } |
201 | xt = tk_xtime(tk); | 190 | update_vsyscall(tk); |
202 | update_vsyscall_old(&xt, &tk->wall_to_monotonic, tk->clock, tk->mult); | ||
203 | } | 191 | } |
204 | 192 | ||
205 | /** | 193 | /** |