---

yaml --- r: 307618 b: refs/heads/master c: cd5398b h: refs/heads/master v: v3
git-mirror · May 21, 2012 · 9d6cfaa · 9d6cfaa
1 parent a4cbc11
commit 9d6cfaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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)