Commit-ID: cd5398bed9296d1ddb21630ac17e90cd19a5c62e Gitweb: http://git.kernel.org/tip/cd5398bed9296d1ddb21630ac17e90cd19a5c62e Author: Richard Cochran <richardcochran@xxxxxxxxx> AuthorDate: Fri, 27 Apr 2012 10:12:41 +0200 Committer: John Stultz <john.stultz@xxxxxxxxxx> CommitDate: Mon, 21 May 2012 16:16:56 -0700 ntp: Fix a stale comment and a few stray newlines. Signed-off-by: Richard Cochran <richardcochran@xxxxxxxxx> Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> --- 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 e8c8671..70b33ab 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-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|