From: Will Deacon <will.deacon@arm.com>
To: John Stultz <john.stultz@linaro.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
Miroslav Lichvar <mlichvar@redhat.com>,
Richard Cochran <richardcochran@gmail.com>,
Prarit Bhargava <prarit@redhat.com>,
Stephen Boyd <stephen.boyd@linaro.org>,
Kevin Brodsky <kevin.brodsky@arm.com>,
Daniel Mentz <danielmentz@google.com>
Subject: Re: [PATCH 1/4] time: Clean up CLOCK_MONOTONIC_RAW time handling
Date: Wed, 21 Jun 2017 10:36:51 +0100 [thread overview]
Message-ID: <20170621093651.GH3768@arm.com> (raw)
In-Reply-To: <1498022493-20292-2-git-send-email-john.stultz@linaro.org>
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 <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Miroslav Lichvar <mlichvar@redhat.com>
> Cc: Richard Cochran <richardcochran@gmail.com>
> Cc: Prarit Bhargava <prarit@redhat.com>
> Cc: Stephen Boyd <stephen.boyd@linaro.org>
> Cc: Kevin Brodsky <kevin.brodsky@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Daniel Mentz <danielmentz@google.com>
> Tested-by: Daniel Mentz <danielmentz@google.com>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
> 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 <will.deacon@arm.com>
Will
next prev parent reply other threads:[~2017-06-21 9:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 5:21 [GIT PULL][PATCH 0/4] Timekeeping items for 4.13 John Stultz
2017-06-21 5:21 ` [PATCH 1/4] time: Clean up CLOCK_MONOTONIC_RAW time handling John Stultz
2017-06-21 9:36 ` Will Deacon [this message]
2017-06-21 5:21 ` [PATCH 2/4] time: Add warning about imminent deprecation of CONFIG_GENERIC_TIME_VSYSCALL_OLD John Stultz
2017-06-21 6:11 ` Paul Mackerras
2017-06-21 6:23 ` John Stultz
2017-06-21 6:15 ` Michael Ellerman
2017-06-21 5:21 ` [PATCH 3/4] kselftests: timers: Fix inconsistency-check to not ignore first timestamp John Stultz
2017-06-21 5:21 ` [PATCH 4/4] kselftests: timers: Add test for frequency step John Stultz
2017-06-21 5:23 ` [GIT PULL][PATCH 0/4] Timekeeping items for 4.13 John Stultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170621093651.GH3768@arm.com \
--to=will.deacon@arm.com \
--cc=danielmentz@google.com \
--cc=john.stultz@linaro.org \
--cc=kevin.brodsky@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mlichvar@redhat.com \
--cc=prarit@redhat.com \
--cc=richardcochran@gmail.com \
--cc=stephen.boyd@linaro.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox