From 9d6cfaa8e9ab8d31de52fffd63a2de5a2debe8fe Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Fri, 27 Apr 2012 10:12:41 +0200 Subject: [PATCH] --- yaml --- r: 307618 b: refs/heads/master c: cd5398bed9296d1ddb21630ac17e90cd19a5c62e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/time/ntp.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5a1364725232..320758eb812e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd48d708ff3e917f6d6b6c2b696c3f18c019feed +refs/heads/master: cd5398bed9296d1ddb21630ac17e90cd19a5c62e diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c index e8c867173ae5..70b33abcc7bb 100644 --- a/trunk/kernel/time/ntp.c +++ b/trunk/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)