2 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index 41b6e31f8f55..d0cb007fa482 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -221,10 +221,11 @@ void update_vsyscall(struct timekeeper *tk)
                 /* tkr_mono.cycle_last == tkr_raw.cycle_last */
                 vdso_data->cs_cycle_last        = tk->tkr_mono.cycle_last;
                 vdso_data->raw_time_sec         = tk->raw_time.tv_sec;
-                vdso_data->raw_time_nsec        = tk->raw_time.tv_nsec;
+                vdso_data->raw_time_nsec        = (tk->raw_time.tv_nsec <<
+                                                   tk->tkr_raw.shift) +
+                                                  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
index e00b4671bd7c..76320e920965 100644
--- a/arch/arm64/kernel/vdso/gettimeofday.S
+++ b/arch/arm64/kernel/vdso/gettimeofday.S
@@ -256,7 +256,6 @@ 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