Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas:
"Fix coarse clock monotonicity (VDSO timestamp off by one jiffy
compared to the syscall one)"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: VDSO: fix coarse clock monotonicity regression
+3
-4
+3
-4
arch/arm64/kernel/vdso.c
+3
-4
arch/arm64/kernel/vdso.c
···
199
199
*/
200
200
void update_vsyscall(struct timekeeper *tk)
201
201
{
202
-
struct timespec xtime_coarse;
203
202
u32 use_syscall = strcmp(tk->tkr_mono.clock->name, "arch_sys_counter");
204
203
205
204
++vdso_data->tb_seq_count;
206
205
smp_wmb();
207
206
208
-
xtime_coarse = __current_kernel_time();
209
207
vdso_data->use_syscall = use_syscall;
210
-
vdso_data->xtime_coarse_sec = xtime_coarse.tv_sec;
211
-
vdso_data->xtime_coarse_nsec = xtime_coarse.tv_nsec;
208
+
vdso_data->xtime_coarse_sec = tk->xtime_sec;
209
+
vdso_data->xtime_coarse_nsec = tk->tkr_mono.xtime_nsec >>
210
+
tk->tkr_mono.shift;
212
211
vdso_data->wtm_clock_sec = tk->wall_to_monotonic.tv_sec;
213
212
vdso_data->wtm_clock_nsec = tk->wall_to_monotonic.tv_nsec;
214
213