Re: [tip:timers/ntp] time: apply NTP frequency/tick changes immediately, fix

[John Stultz <johnstul@us.ibm.com>]

On Thu, 2009-02-26 at 17:57 +0000, John Stultz wrote:
> Author:     John Stultz <johnstul@us.ibm.com>
> AuthorDate: Thu, 26 Feb 2009 09:46:14 -0800
> Commit:     Ingo Molnar <mingo@elte.hu>
> CommitDate: Thu, 26 Feb 2009 18:55:36 +0100
> 
> time: apply NTP frequency/tick changes immediately, fix

Sorry, the commit name isn't quite right there. I should have added the
patch name explicitly. This patch was a fix to the following patch in
-tip:

time: ntp: fix bug in ntp_update_offset() & do_adjtimex()


thanks
-john



> The time_status conditional was accidentally placed right after we clear
> the checked time_status bits, which causes us to take the conditional
> every time through. This fixes it by moving the conditional to before we
> clear the time_status bits.
> 
> Signed-off-by: John Stultz <johnstul@us.ibm.com>
> Cc: Clark Williams <williams@redhat.com>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> 
> 
> ---
>  kernel/time/ntp.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
> index c74eb7d..7fc6437 100644
> --- a/kernel/time/ntp.c
> +++ b/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) {