From: John Stultz <john.stultz@linaro.org>
To: Richard Cochran <richardcochran@gmail.com>
Cc: linux-kernel@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH RFC V1 2/5] ntp: Fix a stale comment and a few stray newlines.
Date: Fri, 27 Apr 2012 15:25:35 -0700 [thread overview]
Message-ID: <4F9B1CDF.7080009@linaro.org> (raw)
In-Reply-To: <5f62cef3da3fa954d9f4f246053e15da1724e792.1335510125.git.richardcochran@gmail.com>
On 04/27/2012 01:12 AM, Richard Cochran wrote:
> Signed-off-by: Richard Cochran<richardcochran@gmail.com>
Queued.
thanks
-john
> ---
> kernel/time/ntp.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
> index f03fd83..d0a2183 100644
> --- a/kernel/time/ntp.c
> +++ b/kernel/time/ntp.c
> @@ -473,8 +473,6 @@ int second_overflow(unsigned long secs)
> << NTP_SCALE_SHIFT;
> time_adjust = 0;
>
> -
> -
> out:
> spin_unlock_irqrestore(&ntp_lock, flags);
>
> @@ -559,10 +557,10 @@ static inline void process_adj_status(struct timex *txc, struct timespec *ts)
> /* only set allowed bits */
> time_status&= STA_RONLY;
> time_status |= txc->status& ~STA_RONLY;
> -
> }
> +
> /*
> - * Called with the xtime lock held, so we can access and modify
> + * Called with ntp_lock held, so we can access and modify
> * all the global NTP state:
> */
> static inline void process_adjtimex_modes(struct timex *txc, struct timespec *ts)
next prev parent reply other threads:[~2012-04-27 22:25 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-27 8:12 [PATCH RFC V1 0/5] Rationalize time keeping Richard Cochran
2012-04-27 8:12 ` [PATCH RFC V1 1/5] Add functions to convert continuous timescales to UTC Richard Cochran
2012-04-27 8:12 ` [PATCH RFC V1 2/5] ntp: Fix a stale comment and a few stray newlines Richard Cochran
2012-04-27 22:25 ` John Stultz [this message]
2012-04-27 8:12 ` [PATCH RFC V1 3/5] timekeeping: Fix a few minor newline issues Richard Cochran
2012-04-27 22:25 ` John Stultz
2012-04-27 8:12 ` [PATCH RFC V1 4/5] timekeeping: Offer an interface to manipulate leap seconds Richard Cochran
2012-04-27 23:08 ` John Stultz
2012-04-28 8:47 ` Richard Cochran
2012-05-05 10:17 ` Richard Cochran
2012-05-07 17:36 ` John Stultz
2012-04-27 8:12 ` [PATCH RFC V1 5/5] timekeeping: Use a continuous timescale to tell time Richard Cochran
2012-05-28 16:49 ` Richard Cochran
2012-04-27 22:49 ` [PATCH RFC V1 0/5] Rationalize time keeping John Stultz
2012-04-28 8:04 ` Richard Cochran
2012-04-30 20:56 ` John Stultz
2012-05-01 7:17 ` Richard Cochran
2012-05-01 8:01 ` John Stultz
2012-05-01 18:43 ` Richard Cochran
2012-05-03 7:02 ` Richard Cochran
2012-05-03 15:48 ` John Stultz
2012-05-03 18:21 ` Richard Cochran
2012-05-03 18:44 ` John Stultz
2012-05-03 19:28 ` Richard Cochran
2012-05-03 19:42 ` John Stultz
2012-05-03 19:57 ` John Stultz
2012-05-05 7:34 ` Richard Cochran
2012-05-05 19:25 ` 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=4F9B1CDF.7080009@linaro.org \
--to=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=richardcochran@gmail.com \
--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