Revert "arm64/vdso: Fix nsec handling for CLOCK_MONOTONIC_RAW"

This reverts commit a4c6fe5. Signed-off-by: khusika <khusikadhamar@gmail.com>
khusika · Oct 13, 2018 · b651361 · b651361
1 parent 80f93fa
commit b651361
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
@@ -222,6 +222,7 @@ void update_vsyscall(struct timekeeper *tk)
 		vdso_data->raw_time_nsec	= tk->tkr_raw.xtime_nsec;
 		vdso_data->xtime_clock_sec	= tk->xtime_sec;
 		vdso_data->xtime_clock_nsec	= tk->tkr_mono.xtime_nsec;
+		/* tkr_raw.xtime_nsec == 0 */
 		vdso_data->cs_mono_mult		= tk->tkr_mono.mult;
 		vdso_data->cs_raw_mult		= tk->tkr_raw.mult;
 		/* tkr_mono.shift == tkr_raw.shift */

diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S
@@ -256,6 +256,7 @@ monotonic_raw:
 	seqcnt_check fail=monotonic_raw
 
 	/* All computations are done with left-shifted nsecs. */
+	lsl	x14, x14, x12
 	get_nsec_per_sec res=x9
 	lsl	x9, x9, x12