From owner-svn-src-stable@FreeBSD.ORG Mon Aug 20 15:03:02 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D2A421065674 for ; Mon, 20 Aug 2012 15:03:02 +0000 (UTC) (envelope-from freebsd@damnhippie.dyndns.org) Received: from qmta01.emeryville.ca.mail.comcast.net (qmta01.emeryville.ca.mail.comcast.net [76.96.30.16]) by mx1.freebsd.org (Postfix) with ESMTP id B28328FC12 for ; Mon, 20 Aug 2012 15:03:02 +0000 (UTC) Received: from omta07.emeryville.ca.mail.comcast.net ([76.96.30.59]) by qmta01.emeryville.ca.mail.comcast.net with comcast id p1Ur1j00F1GXsucA1332j7; Mon, 20 Aug 2012 15:03:02 +0000 Received: from damnhippie.dyndns.org ([24.8.232.202]) by omta07.emeryville.ca.mail.comcast.net with comcast id p3311j00B4NgCEG8U331dC; Mon, 20 Aug 2012 15:03:02 +0000 Received: from [172.22.42.240] (revolution.hippie.lan [172.22.42.240]) by damnhippie.dyndns.org (8.14.3/8.14.3) with ESMTP id q7KF2xN1021095; Mon, 20 Aug 2012 09:02:59 -0600 (MDT) (envelope-from freebsd@damnhippie.dyndns.org) From: Ian Lepore To: Ed Maste In-Reply-To: <201208201426.q7KEQHj8046464@svn.freebsd.org> References: <201208201426.q7KEQHj8046464@svn.freebsd.org> Content-Type: text/plain; charset="us-ascii" Date: Mon, 20 Aug 2012 09:02:59 -0600 Message-ID: <1345474979.27688.317.camel@revolution.hippie.lan> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r239427 - stable/9/contrib/ntp/ntpd X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Aug 2012 15:03:02 -0000 On Mon, 2012-08-20 at 14:26 +0000, Ed Maste wrote: > Author: emaste > Date: Mon Aug 20 14:26:16 2012 > New Revision: 239427 > URL: http://svn.freebsd.org/changeset/base/239427 > > Log: > MFC r232844: Remove extraneous log message > > When ntp switched between PLL and FLL mode it produced a log message > "kernel time sync status change %04x". This issue is reported in ntp > bug 452[1] which claims that this behaviour is normal and the log > message isn't necessary. I'm not sure exactly when it was removed, but > it's gone in the latest ntp release (4.2.6p5). > > [1] http://bugs.ntp.org/show_bug.cgi?id=452 > > Modified: > stable/9/contrib/ntp/ntpd/ntp_loopfilter.c > Directory Properties: > stable/9/contrib/ntp/ (props changed) > > Modified: stable/9/contrib/ntp/ntpd/ntp_loopfilter.c > ============================================================================== > --- stable/9/contrib/ntp/ntpd/ntp_loopfilter.c Mon Aug 20 14:14:19 2012 (r239426) > +++ stable/9/contrib/ntp/ntpd/ntp_loopfilter.c Mon Aug 20 14:26:16 2012 (r239427) > @@ -646,12 +646,6 @@ local_clock( > msyslog(LOG_NOTICE, > "kernel time sync error %04x", ntv.status); > ntv.status &= ~(STA_PPSFREQ | STA_PPSTIME); > - } else { > - if ((ntv.status ^ pll_status) & ~STA_FLL) > - NLOG(NLOG_SYNCEVENT | NLOG_SYSEVENT) > - msyslog(LOG_NOTICE, > - "kernel time sync status change %04x", > - ntv.status); > } > pll_status = ntv.status; > #ifdef STA_NANO The other piece of this change should be to remove the "maxpoll 9" from src/etc/ntp.conf. It was added only to prevent the ntpd steering loop from transitioning from PLL to FLL operation on the transition from 512 to 1024 second poll/update cycles (effectively squelching the log spewage by preventing ntpd from operating normally). Removing the mythology that "FreeBSD requires maxpoll 9 in ntp.conf" from the web will be a much harder change. :) -- Ian