---

yaml --- r: 135759 b: refs/heads/master c: a2a5ac8 h: refs/heads/master i: 135757: e1b6e74 135755: bb33d7b 135751: 1793d98 135743: 1416787 v: v3
git-mirror · Feb 26, 2009 · 7a8ad7c · 7a8ad7c
1 parent 5eb0328
commit 7a8ad7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39854fe8c165872d743f6a0c4860ca2de8e45ac9
+refs/heads/master: a2a5ac8650b570bea3cb3614f77739dcd07d6632
diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c
@@ -365,8 +365,6 @@ static inline void process_adj_status(struct timex *txc, struct timespec *ts)
 		time_state = TIME_OK;
 		time_status = STA_UNSYNC;
 	}
-	/* only set allowed bits */
-	time_status &= STA_RONLY;
 
 	/*
 	 * If we turn on PLL adjustments then reset the
@@ -375,6 +373,8 @@ static inline void process_adj_status(struct timex *txc, struct timespec *ts)
 	if (!(time_status & STA_PLL) && (txc->status & STA_PLL))
 		time_reftime = xtime.tv_sec;
 
+	/* only set allowed bits */
+	time_status &= STA_RONLY;
 	time_status |= txc->status & ~STA_RONLY;
 
 	switch (time_state) {