Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30065bfd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 04da002d 878854a3

arch/arm64/kernel/vdso.c

+3 −4
Original line number Diff line number Diff line
@@ -199,16 +199,15 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, 
 */

void update_vsyscall(struct timekeeper *tk)

{

	struct timespec xtime_coarse;

	u32 use_syscall = strcmp(tk->tkr_mono.clock->name, "arch_sys_counter");



	++vdso_data->tb_seq_count;

	smp_wmb();



	xtime_coarse = __current_kernel_time();

	vdso_data->use_syscall			= use_syscall;

	vdso_data->xtime_coarse_sec		= xtime_coarse.tv_sec;

	vdso_data->xtime_coarse_nsec		= xtime_coarse.tv_nsec;

	vdso_data->xtime_coarse_sec		= tk->xtime_sec;

	vdso_data->xtime_coarse_nsec		= tk->tkr_mono.xtime_nsec >>

							tk->tkr_mono.shift;

	vdso_data->wtm_clock_sec		= tk->wall_to_monotonic.tv_sec;

	vdso_data->wtm_clock_nsec		= tk->wall_to_monotonic.tv_nsec;