On Tue, Jun 20, 2017 at 10:21:30PM -0700, John Stultz wrote: > Now that we fixed the sub-ns handling for CLOCK_MONOTONIC_RAW, > remove the duplicitive tk->raw_time.tv_nsec, which can be > stored in tk->tkr_raw.xtime_nsec (similarly to how its handled > for monotonic time). > > Cc: Thomas Gleixner <[email protected]> > Cc: Ingo Molnar <[email protected]> > Cc: Miroslav Lichvar <[email protected]> > Cc: Richard Cochran <[email protected]> > Cc: Prarit Bhargava <[email protected]> > Cc: Stephen Boyd <[email protected]> > Cc: Kevin Brodsky <[email protected]> > Cc: Will Deacon <[email protected]> > Cc: Daniel Mentz <[email protected]> > Tested-by: Daniel Mentz <[email protected]> > Signed-off-by: John Stultz <[email protected]> > --- > arch/arm64/kernel/vdso.c | 6 ++--- > include/linux/timekeeper_internal.h | 4 ++-- > kernel/time/timekeeping.c | 45 > ++++++++++++++++++++----------------- > 3 files changed, 29 insertions(+), 26 deletions(-) > > diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c > index d0cb007..7492d90 100644 > --- a/arch/arm64/kernel/vdso.c > +++ b/arch/arm64/kernel/vdso.c > @@ -220,10 +220,8 @@ void update_vsyscall(struct timekeeper *tk) > if (!use_syscall) { > /* 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 << > - tk->tkr_raw.shift) + > - tk->tkr_raw.xtime_nsec; > + vdso_data->raw_time_sec = tk->raw_sec; > + 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; > vdso_data->cs_mono_mult = tk->tkr_mono.mult;
For this arm64 bit: Acked-by: Will Deacon <[email protected]> Will
