diff options
| -rw-r--r-- | arch/arm/kernel/vdso.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index efe17dd9b921..54a5aeab988d 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c | |||
| @@ -296,7 +296,6 @@ static bool tk_is_cntvct(const struct timekeeper *tk) | |||
| 296 | */ | 296 | */ |
| 297 | void update_vsyscall(struct timekeeper *tk) | 297 | void update_vsyscall(struct timekeeper *tk) |
| 298 | { | 298 | { |
| 299 | struct timespec xtime_coarse; | ||
| 300 | struct timespec64 *wtm = &tk->wall_to_monotonic; | 299 | struct timespec64 *wtm = &tk->wall_to_monotonic; |
| 301 | 300 | ||
| 302 | if (!cntvct_ok) { | 301 | if (!cntvct_ok) { |
| @@ -308,10 +307,10 @@ void update_vsyscall(struct timekeeper *tk) | |||
| 308 | 307 | ||
| 309 | vdso_write_begin(vdso_data); | 308 | vdso_write_begin(vdso_data); |
| 310 | 309 | ||
| 311 | xtime_coarse = __current_kernel_time(); | ||
| 312 | vdso_data->tk_is_cntvct = tk_is_cntvct(tk); | 310 | vdso_data->tk_is_cntvct = tk_is_cntvct(tk); |
| 313 | vdso_data->xtime_coarse_sec = xtime_coarse.tv_sec; | 311 | vdso_data->xtime_coarse_sec = tk->xtime_sec; |
| 314 | vdso_data->xtime_coarse_nsec = xtime_coarse.tv_nsec; | 312 | vdso_data->xtime_coarse_nsec = (u32)(tk->tkr_mono.xtime_nsec >> |
| 313 | tk->tkr_mono.shift); | ||
| 315 | vdso_data->wtm_clock_sec = wtm->tv_sec; | 314 | vdso_data->wtm_clock_sec = wtm->tv_sec; |
| 316 | vdso_data->wtm_clock_nsec = wtm->tv_nsec; | 315 | vdso_data->wtm_clock_nsec = wtm->tv_nsec; |
| 317 | 316 | ||
