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

Commit 697877f7 authored by Nathan Lynch's avatar Nathan Lynch Committed by Ian Maund
Browse files

arm64: vdso: update wtm fields for CLOCK_MONOTONIC_COARSE 



Update wall-to-monotonic fields in the VDSO data page
unconditionally.  These are used to service CLOCK_MONOTONIC_COARSE,
which is not guarded by use_syscall.

Signed-off-by: default avatarNathan Lynch <nathan_lynch@mentor.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Git-commit: d4022a335271a48cce49df35d825897914fbffe3
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parent a942976e

arch/arm64/kernel/vdso.c

+2 −2
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ void update_vsyscall(struct timekeeper *tk) 
	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->wtm_clock_sec		= tk->wall_to_monotonic.tv_sec;

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



	if (!use_syscall) {

		vdso_data->cs_cycle_last	= tk->clock->cycle_last;
@@ -245,8 +247,6 @@ void update_vsyscall(struct timekeeper *tk) 
		vdso_data->xtime_clock_nsec	= tk->xtime_nsec;

		vdso_data->cs_mult		= tk->mult;

		vdso_data->cs_shift		= tk->shift;

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

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

	}



	smp_wmb();