[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4F9B1CDF.7080009@linaro.org>
Date: Fri, 27 Apr 2012 15:25:35 -0700
From: John Stultz <john.stultz@...aro.org>
To: Richard Cochran <richardcochran@...il.com>
CC: linux-kernel@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>
Subject: Re: [PATCH RFC V1 2/5] ntp: Fix a stale comment and a few stray newlines.
On 04/27/2012 01:12 AM, Richard Cochran wrote:
> Signed-off-by: Richard Cochran<richardcochran@...il.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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists