From 7a8ad7c0e6b40bb16b4c7519ae3b1c548acd798c Mon Sep 17 00:00:00 2001 From: John Stultz Date: Thu, 26 Feb 2009 09:46:14 -0800 Subject: [PATCH] --- yaml --- r: 135759 b: refs/heads/master c: a2a5ac8650b570bea3cb3614f77739dcd07d6632 h: refs/heads/master i: 135757: e1b6e742b18165af5ad684a61c14ea5a0375a163 135755: bb33d7bc51e362cf4773d054bec9c4286af24459 135751: 1793d983aa2370380595a6faae8224b2f05c57c2 135743: 141678741ce6733a9a0ce3662993228357ddfcc9 v: v3 --- [refs] | 2 +- trunk/kernel/time/ntp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a0ccb86a7b33..fba25e06f233 100644 --- 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 index c74eb7d9d854..7fc64375ff43 100644 --- 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) {