summaryrefslogtreecommitdiff
path: root/kernel/time
diff options
context:
space:
mode:
authorRichard Cochran <richardcochran@gmail.com>2012-04-27 10:12:41 +0200
committerJohn Stultz <john.stultz@linaro.org>2012-05-21 16:16:56 -0700
commitcd5398bed9296d1ddb21630ac17e90cd19a5c62e (patch)
tree43952274d6c838eddcf3046e0a35053e3c0c11a9 /kernel/time
parentdd48d708ff3e917f6d6b6c2b696c3f18c019feed (diff)
ntp: Fix a stale comment and a few stray newlines.
Signed-off-by: Richard Cochran <richardcochran@gmail.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/ntp.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index e8c867173ae5..70b33abcc7bb 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)