---

yaml --- r: 135752 b: refs/heads/master c: c7986ac h: refs/heads/master v: v3
git-mirror · Feb 25, 2009 · 21e298c · 21e298c
1 parent 1793d98
commit 21e298c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 478b7aab1682246a3d1e76e27a0aecb2f0013379
+refs/heads/master: c7986acba211e8285e14c9603fb89e6f4ea0b9f8
diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c
@@ -141,10 +141,10 @@ static void ntp_update_offset(long offset)
 	 * Select how the frequency is to be controlled
 	 * and in which mode (PLL or FLL).
 	 */
-	if (time_status & STA_FREQHOLD || time_reftime == 0)
-		time_reftime = xtime.tv_sec;
-
 	secs = xtime.tv_sec - time_reftime;
+	if (unlikely(time_status & STA_FREQHOLD || time_reftime == 0))
+		secs = 0;
+
 	time_reftime = xtime.tv_sec;
 
 	offset64    = offset;